]> granicus.if.org Git - python/commitdiff
Fix prepare_ssl.py for OpenSSL 1.0.2a builds without Perl (using old system).
authorZachary Ware <zachary.ware@gmail.com>
Wed, 8 Apr 2015 01:38:53 +0000 (20:38 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 8 Apr 2015 01:38:53 +0000 (20:38 -0500)
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.

PCbuild/prepare_ssl.py

index 199c4efe2545cd45331c32c3561ce1bab1bd28ab..16d77d9506adb67b501032945f2802aeaac4e2b3 100644 (file)
@@ -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):