Issue #20609: Fix building 64-bit binaries on 32-bit Windows.

diff --git a/Misc/NEWS b/Misc/NEWS
index 4759018d198e0aa61679b93596f3ea920d322d87..211114747f3621ce70b6b984a69af9f8600e6a7d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -131,6 +131,12 @@ Documentation
 - Issue #20488: Importlib is no longer *an* implementation of import, it's *the*
   implementation.
 
+Build
+-----
+
+- Issue #20609: Restored the ability to build 64-bit Windows binaries on
+  32-bit Windows, which was broken by the change in issue #19788.
+
 
 What's New in Python 3.3.4?
 ===========================

diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 89a63d101543bc4462d5c20f422ed25a78c6c962..8b5c42f0ecc7ee5d300bc72f9a8c6dc0b4094d5d 100644 (file)
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -182,7 +182,11 @@
       <BaseAddress>0x1e000000</BaseAddress>
     </Link>
     <PreBuildEvent>
-      <Command>$(KillPythonExe)</Command>
+      <Command>$(KillPythonExe)
+IF %ERRORLEVEL% NEQ 0 (
+    echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
+    exit /b 0
+)</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Killing any running $(PythonExe) instances...</Message>
@@ -213,7 +217,11 @@
       <BaseAddress>0x1e000000</BaseAddress>
     </Link>
     <PreBuildEvent>
-      <Command>$(KillPythonExe)</Command>
+      <Command>$(KillPythonExe)
+IF %ERRORLEVEL% NEQ 0 (
+    echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
+    exit /b 0
+)</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Killing any running $(PythonExe) instances...</Message>
@@ -244,7 +252,11 @@
       <BaseAddress>0x1e000000</BaseAddress>
     </Link>
     <PreBuildEvent>
-      <Command>$(KillPythonExe)</Command>
+      <Command>$(KillPythonExe)
+IF %ERRORLEVEL% NEQ 0 (
+    echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
+    exit /b 0
+)</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Killing any running $(PythonExe) instances...</Message>
@@ -278,7 +290,11 @@
       <BaseAddress>0x1e000000</BaseAddress>
     </Link>
     <PreBuildEvent>
-      <Command>$(KillPythonExe)</Command>
+      <Command>$(KillPythonExe)
+IF %ERRORLEVEL% NEQ 0 (
+    echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
+    exit /b 0
+)</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Killing any running $(PythonExe) instances...</Message>
@@ -307,7 +323,11 @@
       <BaseAddress>0x1e000000</BaseAddress>
     </Link>
     <PreBuildEvent>
-      <Command>$(KillPythonExe)</Command>
+      <Command>$(KillPythonExe)
+IF %ERRORLEVEL% NEQ 0 (
+    echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
+    exit /b 0
+)</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Killing any running $(PythonExe) instances...</Message>
@@ -339,7 +359,11 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PreBuildEvent>
-      <Command>$(KillPythonExe)</Command>
+      <Command>$(KillPythonExe)
+IF %ERRORLEVEL% NEQ 0 (
+    echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
+    exit /b 0
+)</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Killing any running $(PythonExe) instances...</Message>
@@ -368,7 +392,11 @@
       <BaseAddress>0x1e000000</BaseAddress>
     </Link>
     <PreBuildEvent>
-      <Command>$(KillPythonExe)</Command>
+      <Command>$(KillPythonExe)
+IF %ERRORLEVEL% NEQ 0 (
+    echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
+    exit /b 0
+)</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Killing any running $(PythonExe) instances...</Message>
@@ -400,7 +428,11 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PreBuildEvent>
-      <Command>$(KillPythonExe)</Command>
+      <Command>$(KillPythonExe)
+IF %ERRORLEVEL% NEQ 0 (
+    echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
+    exit /b 0
+)</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Killing any running $(PythonExe) instances...</Message>