diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-13 22:01:49 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-13 22:01:49 +0000 |
| commit | bee07175412fefda226a114c00411523459dd0b0 (patch) | |
| tree | 00be73d3dcde0ef10f208f625a27df46ebf45305 /build | |
| parent | daeb33fcbe7fa67ac1037c2235bd4d37c1f8ae27 (diff) | |
| download | chromium_src-bee07175412fefda226a114c00411523459dd0b0.zip chromium_src-bee07175412fefda226a114c00411523459dd0b0.tar.gz chromium_src-bee07175412fefda226a114c00411523459dd0b0.tar.bz2 | |
Allow MSVC to be on a different drive letter than the source code.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 37bea99..a13762e 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -129,12 +129,17 @@ if env['PLATFORM'] == 'win32': msvs_env = Environment(tools=['msvc', 'mslink', 'msvs'])['ENV'] + # Use the absolute path for MSVC because it might not be on the same drive + # as our source checkout. + visual_studio_path = (msvs_env['PATH'][0] + + ':/Program Files/Microsoft Visual Studio 8') + env.Replace( CSCRIPT = 'c:\\Windows\\System32\\cscript', PLATFORMSDK_VISTA_REL = '../third_party/platformsdk_vista_6_0', PLATFORMSDK_VISTA = '#/$PLATFORMSDK_VISTA_REL', - VISUAL_STUDIO = '/Program Files/Microsoft Visual Studio 8', + VISUAL_STUDIO = visual_studio_path, CYGWIN_DIR = Dir('#../third_party/cygwin'), CYGWIN_BIN_DIR = '$CYGWIN_DIR/bin', |