]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Use AMD64 version of CRT in just-for-me installations for Win64 installers.
authorMartin v. Löwis <martin@v.loewis.de>
Fri, 19 Sep 2008 19:20:03 +0000 (19:20 +0000)
committerMartin v. Löwis <martin@v.loewis.de>
Fri, 19 Sep 2008 19:20:03 +0000 (19:20 +0000)
Tools/msi/msi.py

index 4748d7cdcb2a40a91364ad94a7511f70df27f4f4..976367090bb29da75628be3d4f4ac8ec2912a3be 100644 (file)
@@ -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()