summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-09-19 15:21:07 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-09-19 15:21:07 (GMT)
commit175d00784d9574ccf3e20299de009bc01466f92f (patch)
tree338d7efe881100ca1f9902d6dd404a113ef8843d
parent5576091fc7c6724f569e1c8ea6a764ac285e6d86 (diff)
downloadcpython-175d00784d9574ccf3e20299de009bc01466f92f.zip
cpython-175d00784d9574ccf3e20299de009bc01466f92f.tar.gz
cpython-175d00784d9574ccf3e20299de009bc01466f92f.tar.bz2
Bug #3887: Package x64 version of CRT for AMD64
Windows binaries.
-rw-r--r--Misc/NEWS5
-rw-r--r--Tools/msi/merge.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index ecf823c..d6cceb1 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 4123567..3202f98 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"]