Commit 560ee24
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 aab35a9 commit 560ee24
1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -420,13 +420,13 @@ if not defined licensertf goto stage_package | |||
| 420 | 420 | ||
| 421 | 421 | set "use_x64_node_exe=false" | |
| 422 | 422 | if "%target_arch%"=="arm64" if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set "use_x64_node_exe=true" | |
| 423 | + set "x64_node_exe=temp-vcbuild\node-x64-cross-compiling.exe" | ||
| 423 | 424 | if "%use_x64_node_exe%"=="true" ( | |
| 424 | 425 | echo Cross-compilation to ARM64 detected. We'll use the x64 Node executable for license2rtf. | |
| 425 | - if not defined "%x64_node_exe%" set "x64_node_exe=temp-vcbuild\node-x64-cross-compiling.exe" | ||
| 426 | 426 | if not exist "%x64_node_exe%" ( | |
| 427 | 427 | echo Downloading x64 node.exe... | |
| 428 | 428 | if not exist "temp-vcbuild" mkdir temp-vcbuild | |
| 429 | - powershell -c "Invoke-WebRequest -Uri 'https://nodejs.org/dist/latest/win-x64/node.exe' -OutFile 'temp-vcbuild\node-x64-cross-compiling.exe'" | ||
| 429 | + powershell -c "Invoke-WebRequest -Uri 'https://nodejs.org/dist/latest/win-x64/node.exe' -OutFile '%x64_node_exe%'" | ||
| 430 | 430 | ) | |
| 431 | 431 | if not exist "%x64_node_exe%" ( | |
| 432 | 432 | echo Could not find the Node executable at the given x64_node_exe path. Aborting. | |
0 commit comments