Skip to content

Commit 103635c

Browse files
jkunkeeBethGriggs
authored andcommitted
win,build: add ARM64 support to vcbuild.bat
PR-URL: #25995 Reviewed-By: João Reis <reis@janeasystems.com>
1 parent a762907 commit 103635c

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

vcbuild.bat

+4-1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ if /i "%1"=="clean" set target=Clean&goto arg-ok
7373
if /i "%1"=="ia32" set target_arch=x86&goto arg-ok
7474
if /i "%1"=="x86" set target_arch=x86&goto arg-ok
7575
if /i "%1"=="x64" set target_arch=x64&goto arg-ok
76+
if /i "%1"=="arm64" set target_arch=arm64&goto arg-ok
7677
if /i "%1"=="vs2017" set target_env=vs2017&goto arg-ok
7778
if /i "%1"=="noprojgen" set noprojgen=1&goto arg-ok
7879
if /i "%1"=="projgen" set projgen=1&goto arg-ok
@@ -200,7 +201,8 @@ if "%target%"=="Clean" rmdir /S /Q %~dp0deps\icu
200201
call tools\msvs\find_python.cmd
201202
if errorlevel 1 goto :exit
202203

203-
if not defined openssl_no_asm call tools\msvs\find_nasm.cmd
204+
REM NASM is only needed on IA32 and x86_64.
205+
if not defined openssl_no_asm if "%target_arch%" NEQ "arm64" call tools\msvs\find_nasm.cmd
204206
if errorlevel 1 echo Could not find NASM, install it or build with openssl-no-asm. See BUILDING.md.
205207

206208
call :getnodeversion || exit /b 1
@@ -311,6 +313,7 @@ set "msbcpu=/m:2"
311313
if "%NUMBER_OF_PROCESSORS%"=="1" set "msbcpu=/m:1"
312314
set "msbplatform=Win32"
313315
if "%target_arch%"=="x64" set "msbplatform=x64"
316+
if "%target_arch%"=="arm64" set "msbplatform=ARM64"
314317
if "%target%"=="Build" (
315318
if defined no_cctest set target=rename_node_bin_win
316319
if "%test_args%"=="" set target=rename_node_bin_win

0 commit comments

Comments
 (0)