From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 10 Apr 2015 01:16:05 +0000 (-0500)
Subject: Put the NASM pulled from svn.python.org at the front of the PATH.
X-Git-Tag: v2.7.10rc1~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c26afcc8fce54b8c920c21e2faf1259a92f4aa1f;p=thirdparty%2FPython%2Fcpython.git

Put the NASM pulled from svn.python.org at the front of the PATH.

This will prevent failures from the version of NASM installed on buildbots,
if the ability to override the version used is desired again later, we can
figure out a way to opt in.
---

diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 3ba2483a755a..52daef0cbace 100644
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -175,7 +175,8 @@ def main():
         if dir.startswith('nasm'):
             nasm_dir = os.path.join(ssl_dir, os.pardir, dir)
             nasm_dir = os.path.abspath(nasm_dir)
-            os.environ['PATH'] += os.pathsep.join(['', nasm_dir])
+            old_path = os.environ['PATH']
+            os.environ['PATH'] = os.pathsep.join([nasm_dir, old_path])
             break
     else:
         print('NASM was not found, make sure it is on PATH')