Commit 057b5300 authored by Zachary Ware's avatar Zachary Ware

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.
parent b817b77a
...@@ -187,7 +187,8 @@ def main(): ...@@ -187,7 +187,8 @@ def main():
if dir.startswith('nasm'): if dir.startswith('nasm'):
nasm_dir = os.path.join(ssl_dir, os.pardir, dir) nasm_dir = os.path.join(ssl_dir, os.pardir, dir)
nasm_dir = os.path.abspath(nasm_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 break
else: else:
print('NASM was not found, make sure it is on PATH') print('NASM was not found, make sure it is on PATH')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment