diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-01 04:12:25 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-01 04:12:25 +0000 |
| commit | 75dfa965b9221a99e515df165a1ef2ac46cf6e1b (patch) | |
| tree | 684e53eef21fb9bf3cdddc4495470d5ac9fa9190 /build/SConscript.v8 | |
| parent | acf0b57910e86d7faf15453ea2d87ab3fe4cf493 (diff) | |
| download | chromium_src-75dfa965b9221a99e515df165a1ef2ac46cf6e1b.zip chromium_src-75dfa965b9221a99e515df165a1ef2ac46cf6e1b.tar.gz chromium_src-75dfa965b9221a99e515df165a1ef2ac46cf6e1b.tar.bz2 | |
Steps towards isolating Windows-isms in the construction environment from Linux/Posix/Mac-isms, and fixes:
* Only put Windows settings on the construction environment when PLATFORM == 'win32', and provide a PLATFORM == 'posix' block for necessary settings there.
* Don't hard-code C:/ as the location of Microsoft Visual Studio 8, so we can find memset.obj even on buildbot systems that have it installed on D:.
* Work around how SCons 0.98.3 fails to handle environment variables imported from Visual Studio that use | to separate diferent architecture types in the (e.g.) PATH. (This is fixed in 0.98.4, after which we can remove the workaround.)
* Deep copy the environment we use to build v8_shell.exe so objects therein can't pollute other environments.
TBR: evanm,bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/SConscript.v8')
| -rw-r--r-- | build/SConscript.v8 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/SConscript.v8 b/build/SConscript.v8 index d995477..7a8f406 100644 --- a/build/SConscript.v8 +++ b/build/SConscript.v8 @@ -33,8 +33,9 @@ env = env.Clone() # Grungy environment hackery to satisfy the Visual Studio that we're
# going to execute.
+import copy
import os
-env['ENV'] = os.environ.copy()
+env['ENV'] = copy.deepcopy(os.environ)
env.AppendENVPath('INCLUDE', env['MSVS_ENV']['INCLUDE'])
env.AppendENVPath('LIB', env['MSVS_ENV']['LIB'])
|