diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-06-21 15:37:16 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-06-21 15:37:16 (GMT) |
| commit | 31b16a51fd9d0a66ecae98ff9499019c106f6265 (patch) | |
| tree | 67607af2b771090d90b3c93aa2dc9046ecc5f927 /Lib/distutils | |
| parent | 75f94c210a9c270dda64135030a29e7791827473 (diff) | |
| download | cpython-31b16a51fd9d0a66ecae98ff9499019c106f6265.zip cpython-31b16a51fd9d0a66ecae98ff9499019c106f6265.tar.gz cpython-31b16a51fd9d0a66ecae98ff9499019c106f6265.tar.bz2 | |
Merged revisions 82130 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r82130 | benjamin.peterson | 2010-06-21 10:27:46 -0500 (Mon, 21 Jun 2010) | 1 line
fix finding visual studio 2008 on 64 bit #8854
........
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/msvc9compiler.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py index 6455fff..15425d7 100644 --- a/Lib/distutils/msvc9compiler.py +++ b/Lib/distutils/msvc9compiler.py @@ -37,9 +37,18 @@ HKEYS = (winreg.HKEY_USERS, winreg.HKEY_LOCAL_MACHINE, winreg.HKEY_CLASSES_ROOT) -VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f" -WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows" -NET_BASE = r"Software\Microsoft\.NETFramework" +NATIVE_WIN64 = (sys.platform == 'win32' and sys.maxsize > 2**32) +if NATIVE_WIN64: + # Visual C++ is a 32-bit application, so we need to look in + # the corresponding registry branch, if we're running a + # 64-bit Python on Win64 + VS_BASE = r"Software\Wow6432Node\Microsoft\VisualStudio\%0.1f" + WINSDK_BASE = r"Software\Wow6432Node\Microsoft\Microsoft SDKs\Windows" + NET_BASE = r"Software\Wow6432Node\Microsoft\.NETFramework" +else: + VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f" + WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows" + NET_BASE = r"Software\Microsoft\.NETFramework" # A map keyed by get_platform() return values to values accepted by # 'vcvarsall.bat'. Note a cross-compile may combine these (eg, 'x86_amd64' is |