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.
This commit is contained in:
Zachary Ware 2015-04-09 20:16:05 -05:00
parent b817b77a8c
commit 057b530024

View file

@ -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')