diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2010-07-31 10:49:53 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2010-07-31 10:49:53 (GMT) |
| commit | 26d3fc1738ebb2f1dd097009bca44acc1f7362cd (patch) | |
| tree | 42471f6932d47374c66cca7993d4ca2faae9d1d1 | |
| parent | 014e0ca58efed657ae2b6bdd724e4721967d05ef (diff) | |
| download | cpython-26d3fc1738ebb2f1dd097009bca44acc1f7362cd.zip cpython-26d3fc1738ebb2f1dd097009bca44acc1f7362cd.tar.gz cpython-26d3fc1738ebb2f1dd097009bca44acc1f7362cd.tar.bz2 | |
Copy asm files into place.
| -rw-r--r-- | PCbuild/build_ssl.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 498b48e..a75c1fb 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -163,12 +163,14 @@ def main(): do_script = "ms\\do_nasm" makefile="ms\\nt.mak" m32 = makefile + dirsuffix = "32" elif sys.argv[2] == "x64": arch="amd64" configure = "VC-WIN64A" do_script = "ms\\do_win64a" makefile = "ms\\nt64.mak" m32 = makefile.replace('64', '') + dirsuffix = "64" #os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON" else: raise ValueError(str(sys.argv)) @@ -225,6 +227,13 @@ def main(): shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch) shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch) + # If the assembler files don't exist in tmpXX, copy them there + if not os.path.exists("tmp"+dirsuffix): + os.mkdir("tmp"+dirsuffix) + for f in os.listdir("asm"+dirsuffix): + if not f.endswith(".asm"): continue + shutil.copy(r"asm%s\%s" % (dirsuffix, f), "tmp"+dirsuffix) + # Now run make. if arch == "amd64": rc = os.system("ml64 -c -Foms\\uptable.obj ms\\uptable.asm") |