Skip to content

Commit 1f7d2e8

Browse files
niyas-saitjuanarbol
authored andcommitted
build: windows/arm64 native compilation support
Added support for detecting ARM64 host architecture for windows and avoid explicit cross-compilation flag for win/arm64 target as configure.py can auto-detect configuration from host and target architecture. Refs: nodejs/build#2540 PR-URL: #42408 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
1 parent 7766bf9 commit 1f7d2e8

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

configure.py

+1
Original file line numberDiff line numberDiff line change
@@ -1121,6 +1121,7 @@ def host_arch_win():
11211121
'x86' : 'ia32',
11221122
'arm' : 'arm',
11231123
'mips' : 'mips',
1124+
'ARM64' : 'arm64'
11241125
}
11251126

11261127
return matchup.get(arch, 'ia32')

vcbuild.bat

-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ if defined target_arch set configure_flags=%configure_flags% --dest-cpu=%ta
198198
if defined openssl_no_asm set configure_flags=%configure_flags% --openssl-no-asm
199199
if defined DEBUG_HELPER set configure_flags=%configure_flags% --verbose
200200
if "%target_arch%"=="x86" if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set configure_flags=%configure_flags% --no-cross-compiling
201-
if "%target_arch%"=="arm64" set configure_flags=%configure_flags% --cross-compiling
202201

203202
if not exist "%~dp0deps\icu" goto no-depsicu
204203
if "%target%"=="Clean" echo deleting %~dp0deps\icu

0 commit comments

Comments
 (0)