[Python-checkins] cpython (2.7): openssl requires nasm (#21462)

[benjamin.peterson]

http://hg.python.org/cpython/rev/e90024db8d6c
changeset:   90924:e90024db8d6c
branch:      2.7
parent:      90920:605349858156
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat May 31 11:01:37 2014 -0700
summary:
  openssl requires nasm (#21462)

files:
  PCbuild/build_ssl.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -207,9 +207,9 @@
 
         # Now run make.
         if arch == "amd64":
-            rc = os.system(r"ml64 -c -Foms\uptable.obj ms\uptable.asm")
+            rc = os.system("nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm")
             if rc:
-                print("ml64 assembler has failed.")
+                print("nasm assembler has failed.")
                 sys.exit(rc)
 
         shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")

-- 
Repository URL: http://hg.python.org/cpython