Skip to content

Commit 233a66f

Browse files
StefanStojanovicRafaelGSS
authored andcommitted
build: fix arm64 cross-compile from powershell
Starting vcbuild.bat for cross-compiling from powershell was failing the licensertf step because it couldn't find x64_node_exe after downloading. PR-URL: #45890 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent eaf6b63 commit 233a66f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

vcbuild.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -416,13 +416,13 @@ if not defined licensertf goto stage_package
416416

417417
set "use_x64_node_exe=false"
418418
if "%target_arch%"=="arm64" if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set "use_x64_node_exe=true"
419+
set "x64_node_exe=temp-vcbuild\node-x64-cross-compiling.exe"
419420
if "%use_x64_node_exe%"=="true" (
420421
echo Cross-compilation to ARM64 detected. We'll use the x64 Node executable for license2rtf.
421-
if not defined "%x64_node_exe%" set "x64_node_exe=temp-vcbuild\node-x64-cross-compiling.exe"
422422
if not exist "%x64_node_exe%" (
423423
echo Downloading x64 node.exe...
424424
if not exist "temp-vcbuild" mkdir temp-vcbuild
425-
powershell -c "Invoke-WebRequest -Uri 'https://nodejs.org/dist/latest/win-x64/node.exe' -OutFile 'temp-vcbuild\node-x64-cross-compiling.exe'"
425+
powershell -c "Invoke-WebRequest -Uri 'https://nodejs.org/dist/latest/win-x64/node.exe' -OutFile '%x64_node_exe%'"
426426
)
427427
if not exist "%x64_node_exe%" (
428428
echo Could not find the Node executable at the given x64_node_exe path. Aborting.

0 commit comments

Comments
 (0)