Merge pull request #73733 from compnerd/paths

shahmishal · web-flow · commit 639a2c3488ea · 2024-05-21T23:41:57.000-07:00
utils: tweak the path before using a Swift toolchain
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -866,7 +866,9 @@ function Build-CMakeProject {
     }
 
     if ($UseBuiltCompilers.Contains("Swift")) {
-      $env:Path = "$($HostArch.SDKInstallRoot)\usr\bin;$($HostArch.ToolchainInstallRoot)\usr\bin;${env:Path}"
+      $env:Path = "$($HostArch.SDKInstallRoot)\usr\bin;$($HostArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13\src;$($HostArch.ToolchainInstallRoot)\usr\bin;${env:Path}"
+    } elseif ($UsePinnedCompilers.Contains("Swift")) {
+      $env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"
     }
     Invoke-Program cmake.exe @cmakeGenerateArgs
 
@@ -1107,8 +1109,6 @@ function Build-Compilers() {
       }
     }
 
-    $env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"
-
     Build-CMakeProject `
       -Src $SourceCache\llvm-project\llvm `
       -Bin $CompilersBinaryCache `

Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,9 @@ function Build-CMakeProject {`
`866`	`866`	`}`
`867`	`867`
`868`	`868`	`if ($UseBuiltCompilers.Contains("Swift")) {`
`869`		`- $env:Path = "$($HostArch.SDKInstallRoot)\usr\bin;$($HostArch.ToolchainInstallRoot)\usr\bin;${env:Path}"`
	`869`	`+ $env:Path = "$($HostArch.SDKInstallRoot)\usr\bin;$($HostArch.BinaryCache)\cmark-gfm-0.29.0.gfm.13\src;$($HostArch.ToolchainInstallRoot)\usr\bin;${env:Path}"`
	`870`	`+ } elseif ($UsePinnedCompilers.Contains("Swift")) {`
	`871`	`+ $env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"`
`870`	`872`	`}`
`871`	`873`	`Invoke-Program cmake.exe @cmakeGenerateArgs`
`872`	`874`
`@@ -1107,8 +1109,6 @@ function Build-Compilers() {`
`1107`	`1109`	`}`
`1108`	`1110`	`}`
`1109`	`1111`
`1110`		`- $env:Path = "$(Get-PinnedToolchainRuntime);${env:Path}"`
`1111`		`-`
`1112`	`1112`	Build-CMakeProject `
`1113`	`1113`	-Src $SourceCache\llvm-project\llvm `
`1114`	`1114`	-Bin $CompilersBinaryCache `