From 103635c23b180b8f8a2ee85a3b2e6cbff8276c1b Mon Sep 17 00:00:00 2001 From: Jon Kunkee Date: Wed, 5 Dec 2018 14:48:52 -0800 Subject: [PATCH] win,build: add ARM64 support to vcbuild.bat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/25995 Reviewed-By: João Reis --- vcbuild.bat | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vcbuild.bat b/vcbuild.bat index fe5efc0b2db2c6..16e2a5bc0d1bbc 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -73,6 +73,7 @@ if /i "%1"=="clean" set target=Clean&goto arg-ok if /i "%1"=="ia32" set target_arch=x86&goto arg-ok if /i "%1"=="x86" set target_arch=x86&goto arg-ok if /i "%1"=="x64" set target_arch=x64&goto arg-ok +if /i "%1"=="arm64" set target_arch=arm64&goto arg-ok if /i "%1"=="vs2017" set target_env=vs2017&goto arg-ok if /i "%1"=="noprojgen" set noprojgen=1&goto arg-ok if /i "%1"=="projgen" set projgen=1&goto arg-ok @@ -200,7 +201,8 @@ if "%target%"=="Clean" rmdir /S /Q %~dp0deps\icu call tools\msvs\find_python.cmd if errorlevel 1 goto :exit -if not defined openssl_no_asm call tools\msvs\find_nasm.cmd +REM NASM is only needed on IA32 and x86_64. +if not defined openssl_no_asm if "%target_arch%" NEQ "arm64" call tools\msvs\find_nasm.cmd if errorlevel 1 echo Could not find NASM, install it or build with openssl-no-asm. See BUILDING.md. call :getnodeversion || exit /b 1 @@ -311,6 +313,7 @@ set "msbcpu=/m:2" if "%NUMBER_OF_PROCESSORS%"=="1" set "msbcpu=/m:1" set "msbplatform=Win32" if "%target_arch%"=="x64" set "msbplatform=x64" +if "%target_arch%"=="arm64" set "msbplatform=ARM64" if "%target%"=="Build" ( if defined no_cctest set target=rename_node_bin_win if "%test_args%"=="" set target=rename_node_bin_win