Skip to content

Commit 87f3389

Browse files
committed
fixup! build,win: add support for MSVC cross-compilation
1 parent 3f58256 commit 87f3389

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@ def configure_node(o):
10401040

10411041
cross_compiling = (options.cross_compiling
10421042
if options.cross_compiling is not None
1043-
else host_arch not in (target_arch, "x64", "ia32"))
1043+
else target_arch != host_arch)
10441044
if cross_compiling:
10451045
os.environ['GYP_CROSSCOMPILE'] = "1"
10461046
if options.unused_without_snapshot:

vcbuild.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ if defined config_flags set configure_flags=%configure_flags% %config_flags%
196196
if defined target_arch set configure_flags=%configure_flags% --dest-cpu=%target_arch%
197197
if defined openssl_no_asm set configure_flags=%configure_flags% --openssl-no-asm
198198
if defined DEBUG_HELPER set configure_flags=%configure_flags% --verbose
199-
if "%target_arch%" == "arm64" set configure_flags=%configure_flags% --cross-compiling
199+
if "%target_arch%"=="x86" if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set configure_flags=%configure_flags% --no-cross-compiling
200+
if "%target_arch%"=="arm64" set configure_flags=%configure_flags% --cross-compiling
200201

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

0 commit comments

Comments
 (0)