Skip to content

Commit 79993a9

Browse files
committed
Adds warning to prepare_ssl when nasm is not available.
Force clean of externals on buildbots.
1 parent ada6db7 commit 79993a9

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

PCbuild/prepare_ssl.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,9 @@ def main():
174174
if not find_all_on_path('nmake.exe'):
175175
print('Could not find nmake.exe, try running env.bat')
176176
sys.exit(1)
177+
if not find_all_on_path('nasm.exe'):
178+
print('Could not find nasm.exe, please add to PATH')
179+
sys.exit(1)
177180
sys.stdout.flush()
178181

179182
# Put our working Perl at the front of our path

Tools/buildbot/build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ call "%~dp0clean.bat" %*
77
@rem a new version of an external library, especially Tcl/Tk):
88
@rem 1) uncomment the following line:
99

10-
@rem call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only
10+
call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only
1111

1212
@rem 2) commit and push
1313
@rem 3) wait for all Windows bots to start a build with that changeset

0 commit comments

Comments
 (0)