From c26afcc8fce54b8c920c21e2faf1259a92f4aa1f Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Thu, 9 Apr 2015 20:16:05 -0500 Subject: 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. --- PCbuild/build_ssl.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 3ba2483..52daef0 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') -- cgit v0.12