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: v3.5.0a4~126^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=057b5300244ca6ed2473125dabad2b553563e84d;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 3cb4f620fdc1..b6f0551b062c 100644
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -187,7 +187,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')