-
Notifications
You must be signed in to change notification settings - Fork 29.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build, tools, win: add nasm detection for OpenSSL
OpenSSL-1.1.0 requires the nasm assembler for building asm files on Windows. This finds nasm at \Program Files\NASM\nasm.exe or \ProgramFiles(x86)\NASM\nasm.exe in vcbuild.bat for users who did not add its path in their enviroments. Fixes: nodejs/build#1190 Fixes: #4270 PR-URL: #19794 Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
- Loading branch information
1 parent
ae096ba
commit eec659c
Showing
3 changed files
with
25 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
@IF NOT DEFINED DEBUG_HELPER @ECHO OFF | ||
|
||
ECHO Looking for NASM | ||
|
||
FOR /F "delims=" %%a IN ('where nasm 2^> NUL') DO ( | ||
EXIT /B 0 | ||
) | ||
|
||
IF EXIST "%ProgramFiles%\NASM\nasm.exe" ( | ||
SET "Path=%Path%;%ProgramFiles%\NASM" | ||
EXIT /B 0 | ||
) | ||
|
||
IF EXIST "%ProgramFiles(x86)%\NASM\nasm.exe" ( | ||
SET "Path=%Path%;%ProgramFiles(x86)%\NASM" | ||
EXIT /B 0 | ||
) | ||
|
||
EXIT /B 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters