From b5acbcf7166fff0c69fffcc33c62a6199ced9e23 Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Wed, 11 Apr 2018 14:37:42 +0900 Subject: [PATCH] build, tools, win: enable build without nasm Do not terminate vcbuild.bat even if nasm is not found on Windows. In that case, configure emits a warning message and continues to build Node.js with openssl_no_asm option enabled. --- tools/msvs/find_nasm.cmd | 2 +- vcbuild.bat | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/msvs/find_nasm.cmd b/tools/msvs/find_nasm.cmd index d30d2131166caa..bcbb7f6b3d8b24 100644 --- a/tools/msvs/find_nasm.cmd +++ b/tools/msvs/find_nasm.cmd @@ -16,4 +16,4 @@ IF EXIST "%ProgramFiles(x86)%\NASM\nasm.exe" ( EXIT /B 0 ) -EXIT /B 1 +EXIT /B 0 diff --git a/vcbuild.bat b/vcbuild.bat index 19e3d1881cc99c..b8c439b3f8f35a 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -171,7 +171,6 @@ call tools\msvs\find_python.cmd if errorlevel 1 goto :exit call tools\msvs\find_nasm.cmd -if errorlevel 1 echo Could not find NASM, it will not be used. call :getnodeversion || exit /b 1