From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 19 Sep 2008 19:20:03 +0000 (+0000)
Subject: Use AMD64 version of CRT in just-for-me installations for Win64 installers.
X-Git-Tag: v2.6~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d9dca7947ebb35fa35c0a0a28a1f4be0b66051;p=thirdparty%2FPython%2Fcpython.git

Use AMD64 version of CRT in just-for-me installations for Win64 installers.
---

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 4748d7cdcb2a..976367090bb2 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -843,7 +843,11 @@ def add_features(db):
 
 def extract_msvcr90():
     # Find the redistributable files
-    dir = os.path.join(os.environ['VS90COMNTOOLS'], r"..\..\VC\redist\x86\Microsoft.VC90.CRT")
+    if msilib.Win64:
+        arch = "amd64"
+    else:
+        arch = "x86"
+    dir = os.path.join(os.environ['VS90COMNTOOLS'], r"..\..\VC\redist\%s\Microsoft.VC90.CRT" % arch)
 
     result = []
     installer = msilib.MakeInstaller()