summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2010-09-21 16:25:21 (GMT)
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2010-09-21 16:25:21 (GMT)
commit63e9b5065337778cf069964743c3c7aca60e2000 (patch)
treefc142ced258575bc7459efb1f9ace6a5a9407f5d /PCbuild
parent285cd1609d7380514b18767f288f678a0a6bb7c2 (diff)
downloadcpython-63e9b5065337778cf069964743c3c7aca60e2000.zip
cpython-63e9b5065337778cf069964743c3c7aca60e2000.tar.gz
cpython-63e9b5065337778cf069964743c3c7aca60e2000.tar.bz2
Recorded rollback of revisions 84902 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/build_ssl.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 42c0017..7fbacaf 100644
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -226,8 +226,8 @@ def main():
if arch == "amd64":
create_makefile64(makefile, m32)
fix_makefile(makefile)
- shutil.copy2(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
- shutil.copy2(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
+ shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
+ shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
# Now run make.
if arch == "amd64":
@@ -236,8 +236,8 @@ def main():
print("ml64 assembler has failed.")
sys.exit(rc)
- shutil.copy2(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
- shutil.copy2(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
+ shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
+ shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
#makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
makeCommand = "nmake /nologo -f \"%s\"" % makefile