Fix merge damage.

jeffdav · jeffdav · commit e5759f755d1f · 2025-02-13T17:01:59.000-08:00
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -944,7 +944,7 @@ function Fetch-Dependencies {
   }
 }
 
-function Get-PinnedToolchainTool() {
+function Get-PinnedToolchainToolsDir() {
   $ToolchainsRoot = [IO.Path]::Combine("$BinaryCache\toolchains", "$PinnedToolchain", "LocalApp", "Programs", "Swift", "Toolchains")
   $VariantToolchainPath = [IO.Path]::Combine($ToolchainsRoot, "$(Get-PinnedToolchainVersion)+$PinnedToolchainVariant", "usr", "bin")
 

Original file line number	Diff line number	Diff line change
`@@ -944,7 +944,7 @@ function Fetch-Dependencies {`
`944`	`944`	`}`
`945`	`945`	`}`
`946`	`946`
`947`		`-function Get-PinnedToolchainTool() {`
	`947`	`+function Get-PinnedToolchainToolsDir() {`
`948`	`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`