From e1d9dca7947ebb35fa35c0a0a28a1f4be0b66051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 19 Sep 2008 19:20:03 +0000
Subject: [PATCH] Use AMD64 version of CRT in just-for-me installations for
 Win64 installers.

---
 Tools/msi/msi.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 4748d7cdcb2..976367090bb 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()