summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-09-19 19:20:03 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-09-19 19:20:03 (GMT)
commite1d9dca7947ebb35fa35c0a0a28a1f4be0b66051 (patch)
tree24c093e910924279d7315c15d223dec7e9806258
parent175d00784d9574ccf3e20299de009bc01466f92f (diff)
downloadcpython-e1d9dca7947ebb35fa35c0a0a28a1f4be0b66051.zip
cpython-e1d9dca7947ebb35fa35c0a0a28a1f4be0b66051.tar.gz
cpython-e1d9dca7947ebb35fa35c0a0a28a1f4be0b66051.tar.bz2
Use AMD64 version of CRT in just-for-me installations for Win64 installers.
-rw-r--r--Tools/msi/msi.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 4748d7c..9763670 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()