]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Put the NASM pulled from svn.python.org at the front of the PATH.
authorZachary Ware <zachary.ware@gmail.com>
Fri, 10 Apr 2015 01:16:05 +0000 (20:16 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Fri, 10 Apr 2015 01:16:05 +0000 (20:16 -0500)
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.

PCbuild/build_ssl.py

index 3cb4f620fdc19107db1dd770b2d1843976bc3e58..b6f0551b062cf992abf63f7e6f455deaff4e903b 100644 (file)
@@ -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')