Skip to content

Commit

Permalink
build: windows/arm64 native compilation support
Browse files Browse the repository at this point in the history
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
  • Loading branch information
niyas-sait committed Mar 20, 2022
1 parent 32c86f5 commit 9d174e2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -1115,6 +1115,7 @@ def host_arch_win():
'x86' : 'ia32',
'arm' : 'arm',
'mips' : 'mips',
'ARM64' : 'arm64'
}

return matchup.get(arch, 'ia32')
Expand Down
1 change: 0 additions & 1 deletion vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ if defined target_arch set configure_flags=%configure_flags% --dest-cpu=%ta
if defined openssl_no_asm set configure_flags=%configure_flags% --openssl-no-asm
if defined DEBUG_HELPER set configure_flags=%configure_flags% --verbose
if "%target_arch%"=="x86" if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set configure_flags=%configure_flags% --no-cross-compiling
if "%target_arch%"=="arm64" set configure_flags=%configure_flags% --cross-compiling

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

0 comments on commit 9d174e2

Please sign in to comment.