summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-04-07 20:38:53 -0500
committerZachary Ware <zachary.ware@gmail.com>2015-04-07 20:38:53 -0500
commitf975b3d49976b1a5bd91dad16bd6ea6fe61d864a (patch)
treef0f2ca47f27c24ab33b4b5658e90cb823d6a57d3
parentced117452585913395ceffd742c9dd7aeaf80630 (diff)
downloadcpython-git-f975b3d49976b1a5bd91dad16bd6ea6fe61d864a.tar.gz
Fix prepare_ssl.py for OpenSSL 1.0.2a builds without Perl (using old system).
This change affects the makefiles checked into svn.python.org, which the 3.5 build no longer uses. 3.4 and 2.7 both still use those makefiles, but their build_ssl.py scripts don't require an update; if the script is running the 'fix_makefiles' method it already has Perl available anyway.
-rw-r--r--PCbuild/prepare_ssl.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/PCbuild/prepare_ssl.py b/PCbuild/prepare_ssl.py
index 199c4efe25..16d77d9506 100644
--- a/PCbuild/prepare_ssl.py
+++ b/PCbuild/prepare_ssl.py
@@ -132,6 +132,9 @@ def fix_makefile(makefile):
if noalgo not in line:
line = line + noalgo
line = line + '\n'
+ if r'$(SRC_D)\util\copy-if-different.pl' in line:
+ line = line.replace(r'$(SRC_D)\util\copy-if-different.pl',
+ 'copy /Y')
fout.write(line)
def run_configure(configure, do_script):