diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-27 17:10:16 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-27 17:10:16 +0000 |
| commit | c05ef7e4fe5aaadb4193217209a11440bd4d2c27 (patch) | |
| tree | ffb6119c49b1f2aa66cc55431d013478e6a9394c /build/SConscript.main | |
| parent | b8282e475c6be16cdb83338f3caf1dfa8841f03a (diff) | |
| download | chromium_src-c05ef7e4fe5aaadb4193217209a11440bd4d2c27.zip chromium_src-c05ef7e4fe5aaadb4193217209a11440bd4d2c27.tar.gz chromium_src-c05ef7e4fe5aaadb4193217209a11440bd4d2c27.tar.bz2 | |
Add CCACHE_DIR to the list of environment variables
that get passed to the build environment. This allows
us to have our CCACHE_DIR off of NFS.
Review URL: http://codereview.chromium.org/8610
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/SConscript.main')
| -rw-r--r-- | build/SConscript.main | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 873371e..617e5b4 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -270,14 +270,17 @@ elif env['PLATFORM'] == 'posix': # OS_LINUX defined in a weird way. env.FilterOut(CPPDEFINES = ['OS_LINUX=OS_LINUX']) - # Copy some environment variables from the outer environment if they exist. - for envvar in ['CC', 'CXX']: + # Copy some environment variables from the outer environment to the + # SCons.Environment if they exist. + for envvar in ('CC', 'CXX'): if envvar in os.environ: env[envvar] = os.environ[envvar] - # Provide $HOME when compiling so distcc can find its lock file. - env['ENV']['HOME'] = os.environ['HOME'] - if 'DISTCC_HOSTS' in os.environ: - env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] + # Copy these environment variables from the outer environment to the + # environment that the build commands run in. + # $HOME is needed by distcc so it can find its lock file. + for envvar in ('HOME', 'DISTCC_HOSTS', 'CCACHE_DIR'): + if envvar in os.environ: + env['ENV'][envvar] = os.environ[envvar] # TODO(evanm): this is Linux-specific, not posix. # Parse /proc/cpuinfo for processor count. |