diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | build/common.gypi | 5 | ||||
| -rw-r--r-- | site_scons/site_tools/chromium_builders.py | 4 |
3 files changed, 7 insertions, 4 deletions
@@ -26,7 +26,7 @@ deps = { # TODO(mark): Remove once this has moved into depot_tools. "src/tools/gyp": - "http://gyp.googlecode.com/svn/trunk@403", + "http://gyp.googlecode.com/svn/trunk@404", "src/v8": "http://v8.googlecode.com/svn/trunk@1603", diff --git a/build/common.gypi b/build/common.gypi index eb1bc37..d3709ac 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -135,7 +135,7 @@ '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'], + 'FLOCK_LINK': ['flock', '$TOP_BUILDDIR/linker.lock', '$LINK'], # We have several cases where archives depend on each other in # a cyclic fashion. Since the GNU linker does only a single @@ -304,6 +304,9 @@ ], }], ], + 'scons_settings': { + 'sconsbuild_dir': '<(DEPTH)/sconsbuild', + }, 'xcode_settings': { # The Xcode generator will look for an xcode_settings section at the root # of each dict and use it to apply settings on a file-wide basis. Most diff --git a/site_scons/site_tools/chromium_builders.py b/site_scons/site_tools/chromium_builders.py index 4d1e428..56081ea 100644 --- a/site_scons/site_tools/chromium_builders.py +++ b/site_scons/site_tools/chromium_builders.py @@ -191,7 +191,7 @@ def ChromeProgram(env, target, source, *args, **kw): source = compilable_files(env, source) if env.get('_GYP'): prog = env.Program(target, source, *args, **kw) - result = env.Install('$DESTINATION_ROOT', prog) + result = env.Install('$TOP_BUILDDIR', prog) else: result = env.ComponentProgram(target, source, *args, **kw) if env.get('INCREMENTAL'): @@ -202,7 +202,7 @@ def ChromeTestProgram(env, target, source, *args, **kw): source = compilable_files(env, source) if env.get('_GYP'): prog = env.Program(target, source, *args, **kw) - result = env.Install('$DESTINATION_ROOT', prog) + result = env.Install('$TOP_BUILDDIR', prog) else: result = env.ComponentTestProgram(target, source, *args, **kw) if env.get('INCREMENTAL'): |