Fix the runtime and the SDK paths for the swift build compiler case

hjyamauchi · bnbarham · commit 557821049095 · 2025-01-02T14:57:56.000-08:00
This fix is necessary for the native win arm64 build where arm64 isn't the first in the WindowsSDKs list. (cherry picked from commit 4a98e37)
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -1183,7 +1183,7 @@ function Build-CMakeProject {
     }
 
     if ($UseBuiltCompilers.Contains("Swift")) {
-      $env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$(Get-CMarkBinaryCache $Arch)\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;${env:Path}"
+      $env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$(Get-CMarkBinaryCache $BuildArch)\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;$(Get-PinnedToolchainRuntime);${env:Path}"
     } elseif ($UsePinnedCompilers.Contains("Swift")) {
       $env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"
     }
@@ -1944,7 +1944,7 @@ function Build-FoundationMacros() {
 
   $SwiftSDK = $null
   if ($Build) {
-    $SwiftSDK = $BuildArch.SDKInstallRoot
+    $SwiftSDK = $(Get-PinnedToolchainSDK)
   }
 
   $InstallDir = $null
@@ -2580,7 +2580,7 @@ function Build-TestingMacros() {
 
   $SwiftSDK = $null
   if ($Build) {
-    $SwiftSDK = $BuildArch.SDKInstallRoot
+    $SwiftSDK = $(Get-PinnedToolchainSDK)
   }
 
   $Targets = if ($Build) {

Original file line number	Diff line number	Diff line change
`@@ -1183,7 +1183,7 @@ function Build-CMakeProject {`
`1183`	`1183`	`}`
`1184`	`1184`
`1185`	`1185`	`if ($UseBuiltCompilers.Contains("Swift")) {`
`1186`		`- $env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$(Get-CMarkBinaryCache $Arch)\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;${env:Path}"`
	`1186`	`+ $env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$(Get-CMarkBinaryCache $BuildArch)\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;$(Get-PinnedToolchainRuntime);${env:Path}"`
`1187`	`1187`	`} elseif ($UsePinnedCompilers.Contains("Swift")) {`
`1188`	`1188`	`$env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"`
`1189`	`1189`	`}`
`@@ -1944,7 +1944,7 @@ function Build-FoundationMacros() {`
`1944`	`1944`
`1945`	`1945`	`$SwiftSDK = $null`
`1946`	`1946`	`if ($Build) {`
`1947`		`- $SwiftSDK = $BuildArch.SDKInstallRoot`
	`1947`	`+ $SwiftSDK = $(Get-PinnedToolchainSDK)`
`1948`	`1948`	`}`
`1949`	`1949`
`1950`	`1950`	`$InstallDir = $null`
`@@ -2580,7 +2580,7 @@ function Build-TestingMacros() {`
`2580`	`2580`
`2581`	`2581`	`$SwiftSDK = $null`
`2582`	`2582`	`if ($Build) {`
`2583`		`- $SwiftSDK = $BuildArch.SDKInstallRoot`
	`2583`	`+ $SwiftSDK = $(Get-PinnedToolchainSDK)`
`2584`	`2584`	`}`
`2585`	`2585`
`2586`	`2586`	`$Targets = if ($Build) {`