diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-26 18:58:10 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-26 18:58:10 +0000 |
| commit | b5e46b9f4926561231a5e325e1548a2fa7eb6e59 (patch) | |
| tree | c1e608d1e388910f112791f315678ab32000e87e /build | |
| parent | 5228d56c2b19231923504dfbcd306f0c93058fca (diff) | |
| download | chromium_src-b5e46b9f4926561231a5e325e1548a2fa7eb6e59.zip chromium_src-b5e46b9f4926561231a5e325e1548a2fa7eb6e59.tar.gz chromium_src-b5e46b9f4926561231a5e325e1548a2fa7eb6e59.tar.bz2 | |
Update Linux gyp build to import and propagate external environment
variables ($CC, $DISTCC_DIR, $HOME, etc.).
Accomodate spelling change ($CHROME_SRC_DIR => $SRC_DIR) that
makes the gyp SCons a little more generic.
Use the new $LIB_DIR variable the gyp SCons generator now defines for us.
Review URL: http://codereview.chromium.org/42650
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 2 | ||||
| -rw-r--r-- | build/common.gypi | 18 |
2 files changed, 18 insertions, 2 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 1c89d4e..2b91fc2 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -86,6 +86,7 @@ root_env = Environment( all_system_libs = [], CHROME_SRC_DIR = '$MAIN_DIR/..', + SRC_DIR = '$MAIN_DIR/..', DESTINATION_ROOT = '$MAIN_DIR/$BUILD_TARGET_DIR', # Where ComponentTestProgram() will build test executables. @@ -775,6 +776,7 @@ for env in environment_list: # resolving these over and over again. env.Replace( CHROME_SRC_DIR = str(env.Dir('$CHROME_SRC_DIR')), + SRC_DIR = str(env.Dir('$SRC_DIR')), DESTINATION_ROOT = str(env.Dir('$DESTINATION_ROOT')), TARGET_ROOT = str(env.Dir('$TARGET_ROOT')), OBJ_ROOT = str(env.Dir('$OBJ_ROOT')), diff --git a/build/common.gypi b/build/common.gypi index 8094f57..eb1bc37 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -131,8 +131,8 @@ '-m32', '-pthread', ], - 'scons_settings': { - 'LIBPATH': ['$DESTINATION_ROOT/lib'], + 'scons_variable_settings': { + 'LIBPATH': ['$LIB_DIR'], # Linking of large files uses lots of RAM, so serialize links # using the handy flock command from util-linux. 'FLOCK_LINK': ['flock', '$DESTINATION_ROOT/linker.lock', '$LINK'], @@ -155,6 +155,20 @@ 'SHLINKCOM': [['$FLOCK_LINK', '-o', '$TARGET', '$SHLINFLAGS', '$SOURCES', '$_LIBDIRFLAGS', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], 'IMPLICIT_COMMAND_DEPENDENCIES': 0, }, + 'scons_import_variables': [ + 'CC', + 'CXX', + 'LINK', + ], + 'scons_propagate_variables': [ + 'CC', + 'CCACHE_DIR', + 'CXX', + 'DISTCC_DIR', + 'DISTCC_HOSTS', + 'HOME', + 'LINK', + ], }, }], ['OS=="mac"', { |