Special case BinaryCache path concatenation.

jeffdav · jeffdav · commit a3b2fb970df1 · 2025-02-13T16:58:13.000-08:00
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -944,8 +944,8 @@ function Fetch-Dependencies {
   }
 }
 
-function Get-PinnedToolchainToolsDir() {
-  $ToolchainsRoot = [IO.Path]::Combine("$BinaryCache", "toolchains", "$PinnedToolchain", "LocalApp", "Programs", "Swift", "Toolchains")
+function Get-PinnedToolchainTool() {
+  $ToolchainsRoot = [IO.Path]::Combine("$BinaryCache\toolchains", "$PinnedToolchain", "LocalApp", "Programs", "Swift", "Toolchains")
   $VariantToolchainPath = [IO.Path]::Combine($ToolchainsRoot, "$(Get-PinnedToolchainVersion)+$PinnedToolchainVariant", "usr", "bin")
 
   # NOTE: Add a workaround for the main snapshots that inadvertently used the

Original file line number	Diff line number	Diff line change
`@@ -944,8 +944,8 @@ function Fetch-Dependencies {`
`944`	`944`	`}`
`945`	`945`	`}`
`946`	`946`
`947`		`-function Get-PinnedToolchainToolsDir() {`
`948`		`- $ToolchainsRoot = [IO.Path]::Combine("$BinaryCache", "toolchains", "$PinnedToolchain", "LocalApp", "Programs", "Swift", "Toolchains")`
	`947`	`+function Get-PinnedToolchainTool() {`
	`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`
`951`	`951`	`# NOTE: Add a workaround for the main snapshots that inadvertently used the`