From 99895359ed19b28e1108faa104de5bc2be236196 Mon Sep 17 00:00:00 2001 From: Anthony Latsis Date: Wed, 17 Sep 2025 15:48:29 +0100 Subject: [PATCH 1/2] [build-windows-toolchain.bat] Fix environment variable name --- utils/build-windows-toolchain.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build-windows-toolchain.bat b/utils/build-windows-toolchain.bat index 49e95406f5970..e212323bb311b 100644 --- a/utils/build-windows-toolchain.bat +++ b/utils/build-windows-toolchain.bat @@ -81,7 +81,7 @@ call :CloneRepositories || (exit /b 1) :: We only have write access to BuildRoot, so use that as the image root. powershell.exe -ExecutionPolicy RemoteSigned -File %~dp0build.ps1 ^ - %HostArchName% ^ + %HostArchNameArg% ^ -SourceCache %SourceRoot% ^ -BinaryCache %BuildRoot% ^ -ImageRoot %BuildRoot% ^ From 7272215b9edea3c852c6a4062675ac3a1a61bdf1 Mon Sep 17 00:00:00 2001 From: Anthony Latsis Date: Wed, 17 Sep 2025 16:53:19 +0100 Subject: [PATCH 2/2] [build-windows-toolchain.bat] Set `HOST_ARCH_NAME` for script reinvocation Follow-up to https://github.com/swiftlang/swift/pull/84326. --- utils/build-windows-toolchain.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/build-windows-toolchain.bat b/utils/build-windows-toolchain.bat index e212323bb311b..e5e35e6ffff27 100644 --- a/utils/build-windows-toolchain.bat +++ b/utils/build-windows-toolchain.bat @@ -23,6 +23,7 @@ echo set SKIP_PACKAGING=%SKIP_PACKAGING%>> %TEMP%\call-build.cmd echo set SKIP_UPDATE_CHECKOUT=%SKIP_UPDATE_CHECKOUT%>> %TEMP%\call-build.cmd echo set REPO_SCHEME=%REPO_SCHEME%>> %TEMP%\call-build.cmd echo set WINDOWS_SDKS=%WINDOWS_SDKS%>> %TEMP%\call-build.cmd +echo set HOST_ARCH_NAME=%HOST_ARCH_NAME%>> %TEMP%\call-build.cmd echo "%~f0">> %TEMP%\call-build.cmd start /i /b /wait cmd.exe /env=default /c "%TEMP%\call-build.cmd" set ec=%errorlevel%