Pick up 32-bit launcher from PGO directory on 64-bit PGO build.

diff --git a/Misc/NEWS b/Misc/NEWS
index f291a4a0520739c7060644ab1a8f5dddcb283b45..9f729aac9c83cfd00513451d9dcf6f5301b85ab5 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -115,6 +115,8 @@ Tests
 Build
 -----
 
+- Pick up 32-bit launcher from PGO directory on 64-bit PGO build.
+
 - Drop PC\python_nt.h as it's not used. Add input dependency on custom
   build step.
 

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index cacf90433f80206f059b3561ff9ce4232007fd33..d46270c20c24fe0ca606d3797c922cc54bae4395 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -974,14 +974,17 @@ def add_files(db):
     # 32-bit installer.
     # XXX does this still allow to install the component on a 32-bit system?
     # Pick up 32-bit binary always
-    launcher = os.path.join(srcdir, "PCBuild", "py.exe")
+    launchersrc = PCBUILD
+    if launchersrc.lower() == 'pcbuild\\x64-pgo':
+        launchersrc = 'PCBuild\\win32-pgo'
+    launcher = os.path.join(srcdir, launchersrc, "py.exe")
     launcherdir.start_component("launcher", flags = 8+256, keyfile="py.exe")
-    launcherdir.add_file("%s/py.exe" % PCBUILD,
+    launcherdir.add_file(launcher,
                          version=installer.FileVersion(launcher, 0),
                          language=installer.FileVersion(launcher, 1))
-    launcherw = os.path.join(srcdir, "PCBuild", "pyw.exe")
+    launcherw = os.path.join(srcdir, launchersrc, "pyw.exe")
     launcherdir.start_component("launcherw", flags = 8+256, keyfile="pyw.exe")
-    launcherdir.add_file("%s/pyw.exe" % PCBUILD,
+    launcherdir.add_file(launcherw,
                          version=installer.FileVersion(launcherw, 0),
                          language=installer.FileVersion(launcherw, 1))