diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-29 19:41:02 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-29 19:41:02 +0000 |
| commit | 04476d4ed0cc1e3555ae14ffbd7fb706164604bf (patch) | |
| tree | 719d1b33e0f805a2e6b6c30d4247a25238d63ab2 /site_scons | |
| parent | 4d68ca4dd7010a206ee3481ad7dd62dd84806aa2 (diff) | |
| download | chromium_src-04476d4ed0cc1e3555ae14ffbd7fb706164604bf.zip chromium_src-04476d4ed0cc1e3555ae14ffbd7fb706164604bf.tar.gz chromium_src-04476d4ed0cc1e3555ae14ffbd7fb706164604bf.tar.bz2 | |
Forgot this file in CL 4153.
It does weird things on buildbot without it.
Review URL: http://codereview.chromium.org/8886
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'site_scons')
| -rw-r--r-- | site_scons/site_init.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/site_scons/site_init.py b/site_scons/site_init.py index 979cd53..4a94a9c 100644 --- a/site_scons/site_init.py +++ b/site_scons/site_init.py @@ -277,8 +277,15 @@ def BuildEnvironments(environments): c_script = ec.File(c) c_dir = c_script.dir + # TODO(bradnelson): this hack is not in mainline. + # Need to unify how to do this sort of thing. + c_dir = str(c_dir) + if c_dir[0] in ['\\', '/']: + build_dir = None + else: + build_dir = '$OBJ_ROOT/' + c_dir ec.SConscript(c_script, - build_dir='$OBJ_ROOT/' + str(c_dir), + build_dir=build_dir, exports={'env': ec}, duplicate=0) |