Merged revisions 82131 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r82131 | benjamin.peterson | 2010-06-21 10:37:16 -0500 (Mon, 21 Jun 2010) | 9 lines
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
........
................
diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py
index ad021b5..761b9ca 100644
--- a/Lib/distutils/msvc9compiler.py
+++ b/Lib/distutils/msvc9compiler.py
@@ -38,9 +38,18 @@
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
diff --git a/Misc/NEWS b/Misc/NEWS
index 1f08e6e..4464e62 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -778,6 +778,8 @@
Build
-----
+- Issue #8854: Fix finding Visual Studio 2008 on Windows x64.
+
- Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9.
- Issue #7632: When Py_USING_MEMORY_DEBUGGER is defined, disable the