Merge pull request #74212 from hjyamauchi/crosscompile

hjyamauchi · web-flow · commit 1bb335d4a43b · 2024-06-10T10:37:20.000-07:00
Fix the cross-compiling Windows ARM64 build.
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -1068,7 +1068,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
`@@ -1068,7 +1068,7 @@ function Build-CMakeProject {`
`1068`	`1068`	`}`
`1069`	`1069`
`1070`	`1070`	`if ($UseBuiltCompilers.Contains("Swift")) {`
`1071`		`- $env:Path = "$($HostArch.SDKInstallRoot)\usr\bin;$($HostArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13\src;$($HostArch.ToolchainInstallRoot)\usr\bin;${env:Path}"`
	`1071`	`+ $env:Path = "$($BuildArch.SDKInstallRoot)\usr\bin;$($BuildArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13\src;$($BuildArch.ToolchainInstallRoot)\usr\bin;${env:Path}"`
`1072`	`1072`	`} elseif ($UsePinnedCompilers.Contains("Swift")) {`
`1073`	`1073`	`$env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"`
`1074`	`1074`	`}`