diff options
| author | Jon Kunkee <jkunkee@microsoft.com> | 2018-12-05 14:48:52 -0800 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2019-03-04 12:25:05 +0000 |
| commit | 0ff6ce3fa64641044b8070eb5175a4f90a69b817 (patch) | |
| tree | 1b5aacb32bd4dfeb392e80070b1c0aad619e1409 /vcbuild.bat | |
| parent | d57c526cfd822ea55ecb2fecfb804c4a91b5293f (diff) | |
| download | android-node-v8-0ff6ce3fa64641044b8070eb5175a4f90a69b817.tar.gz android-node-v8-0ff6ce3fa64641044b8070eb5175a4f90a69b817.tar.bz2 android-node-v8-0ff6ce3fa64641044b8070eb5175a4f90a69b817.zip | |
win,build: add ARM64 support to vcbuild.bat
PR-URL: https://github.com/nodejs/node/pull/25995
Reviewed-By: João Reis <reis@janeasystems.com>
Diffstat (limited to 'vcbuild.bat')
| -rw-r--r-- | vcbuild.bat | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index 5b09c23c3d..b4117670ed 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -72,6 +72,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 @@ -199,7 +200,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 @@ -310,6 +312,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 |