diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-04-09 20:16:05 -0500 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-04-09 20:16:05 -0500 |
| commit | 057b5300244ca6ed2473125dabad2b553563e84d (patch) | |
| tree | 4a8403284bbee3ba229a84aa6e650b9fb1fbdcd8 /PCbuild | |
| parent | b817b77a8c4c6c3031c48b2ff95f677e9f1f0b94 (diff) | |
| download | cpython-git-057b5300244ca6ed2473125dabad2b553563e84d.tar.gz | |
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.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/build_ssl.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 3cb4f620fd..b6f0551b06 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') |