Fix the cross-compiling Windows ARM64 build.

hjyamauchi · hjyamauchi · commit 3b079a02e046 · 2024-07-25T11:08:38.000-07:00
Fix the path to use the build arch instead of the host arch when invoking the built swift compiler. This fixes the build failure that's currently worked around with extra path setting. Cherrypick commit a079beb
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -866,7 +866,7 @@ function Build-CMakeProject {
     }
 
     if ($UseBuiltCompilers.Contains("Swift")) {
-      $env:Path = "$($HostArch.SDKInstallRoot)\usr\bin;$($HostArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13\src;$($HostArch.ToolchainInstallRoot)\usr\bin;${env:Path}"
+      $env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$($BuildArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;${env:Path}"
     } elseif ($UsePinnedCompilers.Contains("Swift")) {
       $env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"
     }

Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,7 @@ function Build-CMakeProject {`
`866`	`866`	`}`
`867`	`867`
`868`	`868`	`if ($UseBuiltCompilers.Contains("Swift")) {`
`869`		`- $env:Path = "$($HostArch.SDKInstallRoot)\usr\bin;$($HostArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13\src;$($HostArch.ToolchainInstallRoot)\usr\bin;${env:Path}"`
	`869`	`+ $env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$($BuildArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;${env:Path}"`
`870`	`870`	`} elseif ($UsePinnedCompilers.Contains("Swift")) {`
`871`	`871`	`$env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"`
`872`	`872`	`}`