Bug #3887: Package x64 version of CRT for AMD64

Windows binaries.

diff --git a/Misc/NEWS b/Misc/NEWS
index ecf823cad08bac28bdc4befe7605a02e966e9c83..d6cceb19f7282a16bba2e35e1e168a3796548620 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,11 @@ Core and Builtins
 Library
 -------
 
+Build
+-----
+
+- Bug #3887: Package x64 version of CRT for AMD64 Windows binaries.
+
 
 What's New in Python 2.6 release candidate 2?
 =============================================

diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py
index 412356765da6c0110208eadf1dfae35cf280762e..3202f98b2abd944f1478fc1f85728e256c83684e 100644 (file)
--- a/Tools/msi/merge.py
+++ b/Tools/msi/merge.py
@@ -9,7 +9,7 @@ msi = None
 if len(sys.argv)==2:\r
     msi = sys.argv[1]\r
 if Win64:\r
-    modules = ["Microsoft_VC90_CRT_x86.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]\r
+    modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]\r
     if not msi: msi = "python-%s.amd64.msi" % full_current_version\r
 else:\r
     modules = ["Microsoft_VC90_CRT_x86.msm","policy_8_0_Microsoft_VC80_CRT_x86.msm"]\r