Issue #20609: Merge with 3.3.

diff --git a/Misc/NEWS b/Misc/NEWS
index aee36ac0f808758cdc67a99dfe155eb34e6a29e3..4170069c2bc746cb676dcc2c897006e6c7e55499 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,6 +35,12 @@ Library
 
 - Issue #20594: Avoid name clash with the libc function posix_close.
 
+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.4.0 release candidate 1?
 ===============================================

diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 11b7054d3fb926adcf9831a51db22ba54d672046..2296f0bb609636f9d080108995c0b452604baec3 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>