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

Side by Side Diff: build/SConscript.main

Issue 53029: Propagate CC, CXX variables to Webcore and v8 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
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 | Annotate | Revision Log
« 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 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 453
454 # TODO(bradnelson): this is needed for now because target_platform_linux has 454 # TODO(bradnelson): this is needed for now because target_platform_linux has
455 # OS_LINUX defined in a weird way. 455 # OS_LINUX defined in a weird way.
456 linux_env.FilterOut(CPPDEFINES = ['OS_LINUX=OS_LINUX']) 456 linux_env.FilterOut(CPPDEFINES = ['OS_LINUX=OS_LINUX'])
457 457
458 # Copy some environment variables from the outer environment to the 458 # Copy some environment variables from the outer environment to the
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 # Copy these environment variables from the outer environment to the 464 # Copy these environment variables from the outer environment to the
464 # environment that the build commands run in. 465 # environment that the build commands run in.
465 # $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.
466 for envvar in ('HOME', 'DISTCC_DIR', 'DISTCC_HOSTS', 'CCACHE_DIR', 467 for envvar in ('HOME', 'DISTCC_DIR', 'DISTCC_HOSTS', 'CCACHE_DIR',
467 'INTERCEPTOR_SOCKET', 'ENFORGE_DIGEST_CACHE', 468 'INTERCEPTOR_SOCKET', 'ENFORGE_DIGEST_CACHE',
468 'ENFORGE_CACHE_HOST', 'ENFORGE_CACHE_PORT'): 469 'ENFORGE_CACHE_HOST', 'ENFORGE_CACHE_PORT'):
469 if envvar in os.environ: 470 if envvar in os.environ:
470 linux_env['ENV'][envvar] = os.environ[envvar] 471 linux_env['ENV'][envvar] = os.environ[envvar]
471 472
472 excluded_warnings = [ 473 excluded_warnings = [
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 'all_libraries', 888 'all_libraries',
888 'all_languages', 889 'all_languages',
889 'all_programs', 890 'all_programs',
890 'all_test_programs', 891 'all_test_programs',
891 ], projects = [p], 892 ], projects = [p],
892 COMPONENT_VS_PROJECT_SCRIPT_PATH=( 893 COMPONENT_VS_PROJECT_SCRIPT_PATH=(
893 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), 894 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
894 ) 895 )
895 896
896 # ------------------------------------------------------------------------- 897 # -------------------------------------------------------------------------
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