summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2012-09-29 13:10:09 +0200
committerMartin v. Löwis <martin@v.loewis.de>2012-09-29 13:10:09 +0200
commitaa909e42002788b0ececf5d511dc72f2358a5f87 (patch)
tree2f6048cd5f8539a43bff572147a82e0919e87d24
parent8850664d2604d8e6037291a9fe7c9f9fac99bf21 (diff)
parent77cc86f873cd88da0c6e114a895c8df322c1ac2b (diff)
downloadcpython-git-aa909e42002788b0ececf5d511dc72f2358a5f87.tar.gz
Merge with 3.3
-rw-r--r--Tools/msi/msi.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index d46270c20c..2057bebce3 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -977,6 +977,8 @@ def add_files(db):
launchersrc = PCBUILD
if launchersrc.lower() == 'pcbuild\\x64-pgo':
launchersrc = 'PCBuild\\win32-pgo'
+ if launchersrc.lower() == 'pcbuild\\amd64':
+ launchersrc = 'PCBuild'
launcher = os.path.join(srcdir, launchersrc, "py.exe")
launcherdir.start_component("launcher", flags = 8+256, keyfile="py.exe")
launcherdir.add_file(launcher,