diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-27 04:27:01 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-27 04:27:01 +0000 |
| commit | c13fcbd8fa1d88271f31da179fe920bb08007c55 (patch) | |
| tree | c0cc8f79d62690c42317ac2a970549e7cb265edd /site_scons/site_tools | |
| parent | 0757e770ac9ce685ee0db0179271f1a3dba47cb0 (diff) | |
| download | chromium_src-c13fcbd8fa1d88271f31da179fe920bb08007c55.zip chromium_src-c13fcbd8fa1d88271f31da179fe920bb08007c55.tar.gz chromium_src-c13fcbd8fa1d88271f31da179fe920bb08007c55.tar.bz2 | |
Build in a ../sconsbuild directory by default:
* Deps roll for ../sconsbuild support in gyp.
* Add a 'scons_settings': { 'sconsbuild_dir' } setting to common.gypi.
* Change uses of $DESTINATION_ROOT to $TOP_BUILDDIR.
Review URL: http://codereview.chromium.org/53133
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'site_scons/site_tools')
| -rw-r--r-- | site_scons/site_tools/chromium_builders.py | 4 |
1 files changed, 2 insertions, 2 deletions
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'): |