diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 15:02:06 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 15:02:06 +0000 |
| commit | c6bb626853c7ec3b61147c50df7613b7919dc937 (patch) | |
| tree | ba50eb2d2dd6402aaa694dae357b3056243673b8 /build/SConscript.main | |
| parent | 01d23775f0fe53e36b58aa03101104dcb35a23a5 (diff) | |
| download | chromium_src-c6bb626853c7ec3b61147c50df7613b7919dc937.zip chromium_src-c6bb626853c7ec3b61147c50df7613b7919dc937.tar.gz chromium_src-c6bb626853c7ec3b61147c50df7613b7919dc937.tar.bz2 | |
Force SCons to use the VC8 toolchain. (Take 2)
In the presence of an installed copy of the 6.1 SDK, SCons would pick up on the presence of the VC9 toolchain which tags along with it. It would proceed to populate the environment with a mismatched set of paths referring to VC9 includes and libs,
which in turn would cause the chrome base build to terminate with a LNK1103 error complaining of corrupt symbols.
Patch contributed by Siggi @ Google.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/SConscript.main')
| -rw-r--r-- | build/SConscript.main | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 15865ce..44c926f 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -232,6 +232,11 @@ root_env.Append(BUILD_SCONSCRIPTS = sconscripts) windows_env = root_env.Clone() +# TODO(siggi) Remove this code once SCons plays well when the +# Platform SDK 6.1 is installed with VS2005 but not VS2008. +if root_env['PLATFORM'] in ['win32', 'cygwin']: + windows_env['MSVS_VERSION'] = '8.0' + windows_env.Tool('target_platform_windows') windows_env.Tool('component_targets_msvs') # Per target project support. |