Merge pull request #78249 from hjyamauchi/nativearm64

hjyamauchi · web-flow · commit 7ba44982f09f · 2024-12-19T12:37:46.000-08:00
Fix the runtime and the SDK paths for the swift build compiler case
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -1201,7 +1201,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}"
     }
@@ -1969,7 +1969,7 @@ function Build-FoundationMacros() {
 
   $SwiftSDK = $null
   if ($Build) {
-    $SwiftSDK = $BuildArch.SDKInstallRoot
+    $SwiftSDK = $(Get-PinnedToolchainSDK)
   }
 
   $InstallDir = $null
@@ -2621,7 +2621,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
`@@ -1201,7 +1201,7 @@ function Build-CMakeProject {`
`1201`	`1201`	`}`
`1202`	`1202`
`1203`	`1203`	`if ($UseBuiltCompilers.Contains("Swift")) {`
`1204`		`- $env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$(Get-CMarkBinaryCache $Arch)\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;${env:Path}"`
	`1204`	`+ $env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$(Get-CMarkBinaryCache $BuildArch)\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;$(Get-PinnedToolchainRuntime);${env:Path}"`
`1205`	`1205`	`} elseif ($UsePinnedCompilers.Contains("Swift")) {`
`1206`	`1206`	`$env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"`
`1207`	`1207`	`}`
`@@ -1969,7 +1969,7 @@ function Build-FoundationMacros() {`
`1969`	`1969`
`1970`	`1970`	`$SwiftSDK = $null`
`1971`	`1971`	`if ($Build) {`
`1972`		`- $SwiftSDK = $BuildArch.SDKInstallRoot`
	`1972`	`+ $SwiftSDK = $(Get-PinnedToolchainSDK)`
`1973`	`1973`	`}`
`1974`	`1974`
`1975`	`1975`	`$InstallDir = $null`
`@@ -2621,7 +2621,7 @@ function Build-TestingMacros() {`
`2621`	`2621`
`2622`	`2622`	`$SwiftSDK = $null`
`2623`	`2623`	`if ($Build) {`
`2624`		`- $SwiftSDK = $BuildArch.SDKInstallRoot`
	`2624`	`+ $SwiftSDK = $(Get-PinnedToolchainSDK)`
`2625`	`2625`	`}`
`2626`	`2626`
`2627`	`2627`	`$Targets = if ($Build) {`