Special case BinaryCache path concatenation.

jeffdav · jeffdav · commit 720ce165e52e · 2025-02-13T09:19:37.000-08:00
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -945,7 +945,7 @@ function Fetch-Dependencies {
 }
 
 function Get-PinnedToolchainTool() {
-  $ToolchainsRoot = [IO.Path]::Combine("$BinaryCache", "toolchains", "$PinnedToolchain", "LocalApp", "Programs", "Swift", "Toolchains")
+  $ToolchainsRoot = [IO.Path]::Combine("$BinaryCache\toolchains", "$PinnedToolchain", "LocalApp", "Programs", "Swift", "Toolchains")
   $VariantToolchainPath = [IO.Path]::Combine($ToolchainsRoot, "$(Get-PinnedToolchainVersion)+$PinnedToolchainVariant", "usr", "bin")
   if (Test-Path $VariantToolchainPath) {
     return $VariantToolchainPath

Original file line number	Diff line number	Diff line change
`@@ -945,7 +945,7 @@ function Fetch-Dependencies {`
`945`	`945`	`}`
`946`	`946`
`947`	`947`	`function Get-PinnedToolchainTool() {`
`948`		`- $ToolchainsRoot = [IO.Path]::Combine("$BinaryCache", "toolchains", "$PinnedToolchain", "LocalApp", "Programs", "Swift", "Toolchains")`
	`948`	`+ $ToolchainsRoot = [IO.Path]::Combine("$BinaryCache\toolchains", "$PinnedToolchain", "LocalApp", "Programs", "Swift", "Toolchains")`
`949`	`949`	`$VariantToolchainPath = [IO.Path]::Combine($ToolchainsRoot, "$(Get-PinnedToolchainVersion)+$PinnedToolchainVariant", "usr", "bin")`
`950`	`950`	`if (Test-Path $VariantToolchainPath) {`
`951`	`951`	`return $VariantToolchainPath`