From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 19 Sep 2008 15:21:07 +0000 (+0000)
Subject: Bug #3887: Package x64 version of CRT for AMD64
X-Git-Tag: v2.6~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=175d00784d9574ccf3e20299de009bc01466f92f;p=thirdparty%2FPython%2Fcpython.git

Bug #3887: Package x64 version of CRT for AMD64
Windows binaries.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index ecf823cad08b..d6cceb19f728 100644
--- 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 412356765da6..3202f98b2abd 100644
--- a/Tools/msi/merge.py
+++ b/Tools/msi/merge.py
@@ -9,7 +9,7 @@ msi = None
 if len(sys.argv)==2:
     msi = sys.argv[1]
 if Win64:
-    modules = ["Microsoft_VC90_CRT_x86.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]
+    modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]
     if not msi: msi = "python-%s.amd64.msi" % full_current_version
 else:
     modules = ["Microsoft_VC90_CRT_x86.msm","policy_8_0_Microsoft_VC80_CRT_x86.msm"]