| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import os | 5 import os |
| 6 import shutil | 6 import shutil |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 | 9 |
| 10 p = ARGUMENTS.get('PROGRESS') | 10 p = ARGUMENTS.get('PROGRESS') |
| (...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 466 excluded_warnings = [ | 466 excluded_warnings = [ |
| 467 # TODO: Clean up uses of ext/hash_map and remove this. | 467 # TODO: Clean up uses of ext/hash_map and remove this. |
| 468 # (see unordered_map and base/hash_tables.h) | 468 # (see unordered_map and base/hash_tables.h) |
| 469 '-Wno-deprecated', # Needed for using ext/hash_map on GCC 4.3 | 469 '-Wno-deprecated', # Needed for using ext/hash_map on GCC 4.3 |
| 470 '-Wno-unknown-pragmas', # In wtf's ref counting system | 470 '-Wno-unknown-pragmas', # In wtf's ref counting system |
| 471 ] | 471 ] |
| 472 linux_env.Append( | 472 linux_env.Append( |
| 473 BUILD_SCONSCRIPTS = [ | 473 BUILD_SCONSCRIPTS = [ |
| 474 '$LIBEVENT_DIR/libevent.scons', | 474 '$LIBEVENT_DIR/libevent.scons', |
| 475 ], | 475 ], |
| 476 CCFLAGS = ['-m32', '-pthread', '-march=i686'], | 476 CCFLAGS = ['-m32', '-pthread', '-march=i686', '-fno-exceptions'], |
| 477 CXXFLAGS = ['-Wall', '-Werror', '-march=i686'] + excluded_warnings, | 477 CXXFLAGS = ['-Wall', '-Werror', '-march=i686'] + excluded_warnings, |
| 478 LINKFLAGS = ['-m32', '-pthread'], | 478 LINKFLAGS = ['-m32', '-pthread'], |
| 479 ) | 479 ) |
| 480 | 480 |
| 481 linux_env.Replace( | 481 linux_env.Replace( |
| 482 # Linking of large files uses lots of RAM, so serialize links | 482 # Linking of large files uses lots of RAM, so serialize links |
| 483 # using the handy flock command from util-linux. | 483 # using the handy flock command from util-linux. |
| 484 LINK = 'flock $TARGET_ROOT/linker.lock ' + linux_env['LINK'], | 484 LINK = 'flock $TARGET_ROOT/linker.lock ' + linux_env['LINK'], |
| 485 | 485 |
| 486 # We have several cases where archives depend on each other in a cyclic | 486 # We have several cases where archives depend on each other in a cyclic |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 789 'all_libraries', | 789 'all_libraries', |
| 790 'all_languages', | 790 'all_languages', |
| 791 'all_programs', | 791 'all_programs', |
| 792 'all_test_programs', | 792 'all_test_programs', |
| 793 ], projects = [p], | 793 ], projects = [p], |
| 794 COMPONENT_VS_PROJECT_SCRIPT_PATH=( | 794 COMPONENT_VS_PROJECT_SCRIPT_PATH=( |
| 795 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), | 795 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), |
| 796 ) | 796 ) |
| 797 | 797 |
| 798 # ------------------------------------------------------------------------- | 798 # ------------------------------------------------------------------------- |
| OLD | NEW |