Merge pull request #81048 from compnerd/build-host-build

compnerd · web-flow · commit 63db34271aa3 · 2025-04-25T07:52:11.000-07:00
utils: correct the host that we reference for the tools
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -1535,9 +1535,9 @@ function Build-SPMProject {
   $Stopwatch = [Diagnostics.Stopwatch]::StartNew()
 
   Invoke-IsolatingEnvVars {
-    $RuntimeInstallRoot = [IO.Path]::Combine((Get-InstallDir $HostPlatform), "Runtimes", $ProductVersion)
+    $RuntimeInstallRoot = [IO.Path]::Combine((Get-InstallDir $BuildPlatform), "Runtimes", $ProductVersion)
 
-    $env:Path = "$RuntimeInstallRoot\usr\bin;$($HostPlatform.ToolchainInstallRoot)\usr\bin;${env:Path}"
+    $env:Path = "$RuntimeInstallRoot\usr\bin;$($BuildPlatform.ToolchainInstallRoot)\usr\bin;${env:Path}"
     $env:SDKROOT = (Get-SwiftSDK Windows)
     $env:SWIFTCI_USE_LOCAL_DEPS = "1"
 
@@ -1573,7 +1573,7 @@ function Build-SPMProject {
       }
     }
 
-    Invoke-Program "$($HostPlatform.ToolchainInstallRoot)\usr\bin\swift.exe" $ActionName @Arguments @AdditionalArguments
+    Invoke-Program "$($BuildPlatform.ToolchainInstallRoot)\usr\bin\swift.exe" $ActionName @Arguments @AdditionalArguments
   }
 
   if (-not $ToBatch) {

Original file line number	Diff line number	Diff line change
`@@ -1535,9 +1535,9 @@ function Build-SPMProject {`
`1535`	`1535`	`$Stopwatch = [Diagnostics.Stopwatch]::StartNew()`
`1536`	`1536`
`1537`	`1537`	`Invoke-IsolatingEnvVars {`
`1538`		`- $RuntimeInstallRoot = [IO.Path]::Combine((Get-InstallDir $HostPlatform), "Runtimes", $ProductVersion)`
	`1538`	`+ $RuntimeInstallRoot = [IO.Path]::Combine((Get-InstallDir $BuildPlatform), "Runtimes", $ProductVersion)`
`1539`	`1539`
`1540`		`- $env:Path = "$RuntimeInstallRoot\usr\bin;$($HostPlatform.ToolchainInstallRoot)\usr\bin;${env:Path}"`
	`1540`	`+ $env:Path = "$RuntimeInstallRoot\usr\bin;$($BuildPlatform.ToolchainInstallRoot)\usr\bin;${env:Path}"`
`1541`	`1541`	`$env:SDKROOT = (Get-SwiftSDK Windows)`
`1542`	`1542`	`$env:SWIFTCI_USE_LOCAL_DEPS = "1"`
`1543`	`1543`
`@@ -1573,7 +1573,7 @@ function Build-SPMProject {`
`1573`	`1573`	`}`
`1574`	`1574`	`}`
`1575`	`1575`
`1576`		`- Invoke-Program "$($HostPlatform.ToolchainInstallRoot)\usr\bin\swift.exe" $ActionName @Arguments @AdditionalArguments`
	`1576`	`+ Invoke-Program "$($BuildPlatform.ToolchainInstallRoot)\usr\bin\swift.exe" $ActionName @Arguments @AdditionalArguments`
`1577`	`1577`	`}`
`1578`	`1578`
`1579`	`1579`	`if (-not $ToBatch) {`