| 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 if sys.platform == 'win32': | 10 if sys.platform == 'win32': |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 for envvar in ('HOME', 'DISTCC_DIR', 'DISTCC_HOSTS', 'CCACHE_DIR', | 398 for envvar in ('HOME', 'DISTCC_DIR', 'DISTCC_HOSTS', 'CCACHE_DIR', |
| 399 'INTERCEPTOR_SOCKET', 'ENFORGE_DIGEST_CACHE', | 399 'INTERCEPTOR_SOCKET', 'ENFORGE_DIGEST_CACHE', |
| 400 'ENFORGE_CACHE_HOST', 'ENFORGE_CACHE_PORT'): | 400 'ENFORGE_CACHE_HOST', 'ENFORGE_CACHE_PORT'): |
| 401 if envvar in os.environ: | 401 if envvar in os.environ: |
| 402 linux_env['ENV'][envvar] = os.environ[envvar] | 402 linux_env['ENV'][envvar] = os.environ[envvar] |
| 403 | 403 |
| 404 excluded_warnings = [ | 404 excluded_warnings = [ |
| 405 # TODO: Clean up uses of ext/hash_map and remove this. | 405 # TODO: Clean up uses of ext/hash_map and remove this. |
| 406 # (see unordered_map and base/hash_tables.h) | 406 # (see unordered_map and base/hash_tables.h) |
| 407 '-Wno-deprecated', # Needed for using ext/hash_map on GCC 4.3 | 407 '-Wno-deprecated', # Needed for using ext/hash_map on GCC 4.3 |
| 408 '-Wno-unknown-pragmas', # In wtf's ref counting system | |
| 409 ] | 408 ] |
| 410 linux_env.Append( | 409 linux_env.Append( |
| 411 BUILD_SCONSCRIPTS = [ | 410 BUILD_SCONSCRIPTS = [ |
| 412 '$LIBEVENT_DIR/libevent.scons', | 411 '$LIBEVENT_DIR/libevent.scons', |
| 413 ], | 412 ], |
| 414 CCFLAGS = ['-m32', '-pthread', '-march=i686', '-fno-exceptions'], | 413 CCFLAGS = ['-m32', '-pthread', '-march=i686', '-fno-exceptions'], |
| 415 CXXFLAGS = ['-Wall', '-Werror', '-march=i686'] + excluded_warnings, | 414 CXXFLAGS = ['-Wall', '-Werror', '-march=i686'] + excluded_warnings, |
| 416 LINKFLAGS = ['-m32', '-pthread'], | 415 LINKFLAGS = ['-m32', '-pthread'], |
| 417 ) | 416 ) |
| 418 | 417 |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 'all_libraries', | 716 'all_libraries', |
| 718 'all_languages', | 717 'all_languages', |
| 719 'all_programs', | 718 'all_programs', |
| 720 'all_test_programs', | 719 'all_test_programs', |
| 721 ], projects = [p], | 720 ], projects = [p], |
| 722 COMPONENT_VS_PROJECT_SCRIPT_PATH=( | 721 COMPONENT_VS_PROJECT_SCRIPT_PATH=( |
| 723 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), | 722 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), |
| 724 ) | 723 ) |
| 725 | 724 |
| 726 # ------------------------------------------------------------------------- | 725 # ------------------------------------------------------------------------- |
| OLD | NEW |