Fix merge damage.

jeffdav · jeffdav · commit 67d7108ad4c7 · 2025-02-17T19:07:05.000-08:00
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -927,7 +927,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
`@@ -927,7 +927,7 @@ function Fetch-Dependencies {`
`927`	`927`	`}`
`928`	`928`	`}`
`929`	`929`
`930`		`-function Get-PinnedToolchainTool() {`
	`930`	`+function Get-PinnedToolchainToolsDir() {`
`931`	`931`	`$ToolchainsRoot = [IO.Path]::Combine("$BinaryCache\toolchains", "$PinnedToolchain", "LocalApp", "Programs", "Swift", "Toolchains")`
`932`	`932`	`$VariantToolchainPath = [IO.Path]::Combine($ToolchainsRoot, "$(Get-PinnedToolchainVersion)+$PinnedToolchainVariant", "usr", "bin")`
`933`	`933`