From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 8 Mar 2016 18:29:24 +0000 (-0800)
Subject: Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
X-Git-Tag: v3.6.0a1~512
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43cbd05b6cac24a0e1bf13cf326766d3dc3ebea9;p=thirdparty%2FPython%2Fcpython.git

Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
---

43cbd05b6cac24a0e1bf13cf326766d3dc3ebea9
diff --cc Misc/NEWS
index cb04c90fd084,28674b8a0c2f..205891b902ba
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -793,9 -294,16 +793,11 @@@ Test
  Build
  -----
  
+ - Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
+ 
 -- Issue #24421: Compile Modules/_math.c once, before building extensions.
 -  Previously it could fail to compile properly if the math and cmath builds
 -  were concurrent.
 -
  - Issue #25348: Added ``--pgo`` and ``--pgo-job`` arguments to
    ``PCbuild\build.bat`` for building with Profile-Guided Optimization.  The
 -  old ``PCbuild\build_pgo.bat`` script is now deprecated, and simply calls
 -  ``PCbuild\build.bat --pgo %*``.
 +  old ``PCbuild\build_pgo.bat`` script is removed.
  
  - Issue #25827: Add support for building with ICC to ``configure``, including
    a new ``--with-icc`` flag.
diff --cc PCbuild/prepare_ssl.bat
index 3153615df12e,1be73e6c365c..2f41ae847da5
--- a/PCbuild/prepare_ssl.bat
+++ b/PCbuild/prepare_ssl.bat
@@@ -1,12 -1,12 +1,12 @@@
  @echo off
  if not defined HOST_PYTHON (
-   if %1 EQU Debug (
+   if "%1" EQU "Debug" (
      shift
      set HOST_PYTHON=python_d.exe
 -    if not exist python35_d.dll exit 1
 +    if not exist python36_d.dll exit 1
    ) ELSE (
      set HOST_PYTHON=python.exe
 -    if not exist python35.dll exit 1
 +    if not exist python36.dll exit 1
    )
  )
- %HOST_PYTHON% prepare_ssl.py %1
+ %HOST_PYTHON% "%~dp0prepare_ssl.py" %1