Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Side by Side Diff: build/SConscript.main

Issue 42637: Make sure *BUILD* env vars are passed around for Linux official builds. (Closed)
Patch Set: Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 # SCons.Environment if they exist. 459 # SCons.Environment if they exist.
460 for envvar in ('CC', 'CXX', 'LINK'): 460 for envvar in ('CC', 'CXX', 'LINK'):
461 if envvar in os.environ: 461 if envvar in os.environ:
462 linux_env[envvar] = os.environ[envvar] 462 linux_env[envvar] = os.environ[envvar]
463 linux_env['ENV'][envvar] = os.environ[envvar] 463 linux_env['ENV'][envvar] = os.environ[envvar]
464 # Copy these environment variables from the outer environment to the 464 # Copy these environment variables from the outer environment to the
465 # environment that the build commands run in. 465 # environment that the build commands run in.
466 # $HOME is needed by distcc so it can find its lock file. 466 # $HOME is needed by distcc so it can find its lock file.
467 for envvar in ('HOME', 'DISTCC_DIR', 'DISTCC_HOSTS', 'CCACHE_DIR', 467 for envvar in ('HOME', 'DISTCC_DIR', 'DISTCC_HOSTS', 'CCACHE_DIR',
468 'INTERCEPTOR_SOCKET', 'ENFORGE_DIGEST_CACHE', 468 'INTERCEPTOR_SOCKET', 'ENFORGE_DIGEST_CACHE',
469 'CHROME_BUILD_TYPE', 'CHROMIUM_BUILD',
469 'ENFORGE_CACHE_HOST', 'ENFORGE_CACHE_PORT'): 470 'ENFORGE_CACHE_HOST', 'ENFORGE_CACHE_PORT'):
470 if envvar in os.environ: 471 if envvar in os.environ:
471 linux_env['ENV'][envvar] = os.environ[envvar] 472 linux_env['ENV'][envvar] = os.environ[envvar]
472 473
473 excluded_warnings = [ 474 excluded_warnings = [
474 # TODO: Clean up uses of ext/hash_map and remove this. 475 # TODO: Clean up uses of ext/hash_map and remove this.
475 # (see unordered_map and base/hash_tables.h) 476 # (see unordered_map and base/hash_tables.h)
476 '-Wno-deprecated', # Needed for using ext/hash_map on GCC 4.3 477 '-Wno-deprecated', # Needed for using ext/hash_map on GCC 4.3
477 ] 478 ]
478 if not root_env.get('_GYP'): 479 if not root_env.get('_GYP'):
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 'all_libraries', 889 'all_libraries',
889 'all_languages', 890 'all_languages',
890 'all_programs', 891 'all_programs',
891 'all_test_programs', 892 'all_test_programs',
892 ], projects = [p], 893 ], projects = [p],
893 COMPONENT_VS_PROJECT_SCRIPT_PATH=( 894 COMPONENT_VS_PROJECT_SCRIPT_PATH=(
894 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), 895 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
895 ) 896 )
896 897
897 # ------------------------------------------------------------------------- 898 # -------------------------------------------------------------------------
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698