From b5e46b9f4926561231a5e325e1548a2fa7eb6e59 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Thu, 26 Mar 2009 18:58:10 +0000 Subject: 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 --- site_scons/site_tools/chromium_builders.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'site_scons/site_tools') diff --git a/site_scons/site_tools/chromium_builders.py b/site_scons/site_tools/chromium_builders.py index 334ac83..52c06c7 100644 --- a/site_scons/site_tools/chromium_builders.py +++ b/site_scons/site_tools/chromium_builders.py @@ -146,7 +146,7 @@ def ChromeLibrary(env, target, source, *args, **kw): source = compilable_files(env, source) if env.get('_GYP'): lib = env.Library(target, source, *args, **kw) - result = env.Install('$DESTINATION_ROOT/$BUILD_TYPE/lib', lib) + result = env.Install('$LIB_DIR', lib) else: result = env.ComponentLibrary(target, source, *args, **kw) return result @@ -164,7 +164,7 @@ def ChromeStaticLibrary(env, target, source, *args, **kw): source = compilable_files(env, source) if env.get('_GYP'): lib = env.StaticLibrary(target, source, *args, **kw) - result = env.Install('$DESTINATION_ROOT/$BUILD_TYPE/lib', lib) + result = env.Install('$LIB_DIR', lib) else: kw['COMPONENT_STATIC'] = True result = env.ComponentLibrary(target, source, *args, **kw) @@ -174,7 +174,7 @@ def ChromeSharedLibrary(env, target, source, *args, **kw): source = compilable_files(env, source) if env.get('_GYP'): lib = env.SharedLibrary(target, source, *args, **kw) - result = env.Install('$DESTINATION_ROOT/$BUILD_TYPE/lib', lib) + result = env.Install('$LIB_DIR', lib) else: kw['COMPONENT_STATIC'] = False result = [env.ComponentLibrary(target, source, *args, **kw)[0]] @@ -241,12 +241,12 @@ def generate(env): env.AddMethod(FilterOut) # Add the grit tool to the base environment because we use this a lot. - sys.path.append(env.Dir('$CHROME_SRC_DIR/tools/grit').abspath) - env.Tool('scons', toolpath=[env.Dir('$CHROME_SRC_DIR/tools/grit/grit')]) + sys.path.append(env.Dir('$SRC_DIR/tools/grit').abspath) + env.Tool('scons', toolpath=[env.Dir('$SRC_DIR/tools/grit/grit')]) # Add the repack python script tool that we use in multiple places. - sys.path.append(env.Dir('$CHROME_SRC_DIR/tools/data_pack').abspath) - env.Tool('scons', toolpath=[env.Dir('$CHROME_SRC_DIR/tools/data_pack/')]) + sys.path.append(env.Dir('$SRC_DIR/tools/data_pack').abspath) + env.Tool('scons', toolpath=[env.Dir('$SRC_DIR/tools/data_pack/')]) def exists(env): return True -- cgit v1.1