From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 31 May 2014 18:01:37 +0000 (-0700)
Subject: openssl requires nasm (#21462)
X-Git-Tag: v2.7.8~37^2~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e33a86b6744e54561d244f8d95708da26273f1a;p=thirdparty%2FPython%2Fcpython.git

openssl requires nasm (#21462)
---

diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 526eba30cbf3..151aa54f74ab 100644
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -207,9 +207,9 @@ def main():
 
         # 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")