Merge pull request #327 from tayloraswift/fix-incorrect-cli-invocation

tayloraswift · web-flow · commit 1c3ea41246c8 · 2024-08-27T16:27:05.000-05:00
update `--swift-toolchain` invocation
diff --git a/Sources/UnidocClient/Unidoc.Client.swift b/Sources/UnidocClient/Unidoc.Client.swift
@@ -209,15 +209,8 @@ extension Unidoc.Client<HTTP.Client2>
                 }
                 if  let usr:FilePath.Directory = toolchain.usr
                 {
-                    let lib:FilePath.Directory = usr / "lib"
-
-                    arguments.append("--swift-runtime")
-                    arguments.append("\(lib)")
-
-                    let swift:FilePath.Directory = usr / "bin" / "swift"
-
-                    arguments.append("--swift")
-                    arguments.append("\(swift)")
+                    arguments.append("--swift-toolchain")
+                    arguments.append("\(usr)")
                 }
                 if  let sdk:SSGC.AppleSDK = toolchain.sdk
                 {

Original file line number	Diff line number	Diff line change
`@@ -209,15 +209,8 @@ extension Unidoc.Client<HTTP.Client2>`
`209`	`209`	`}`
`210`	`210`	`if let usr:FilePath.Directory = toolchain.usr`
`211`	`211`	`{`
`212`		`- let lib:FilePath.Directory = usr / "lib"`
`213`		`-`
`214`		`- arguments.append("--swift-runtime")`
`215`		`- arguments.append("\(lib)")`
`216`		`-`
`217`		`- let swift:FilePath.Directory = usr / "bin" / "swift"`
`218`		`-`
`219`		`- arguments.append("--swift")`
`220`		`- arguments.append("\(swift)")`
	`212`	`+ arguments.append("--swift-toolchain")`
	`213`	`+ arguments.append("\(usr)")`
`221`	`214`	`}`
`222`	`215`	`if let sdk:SSGC.AppleSDK = toolchain.sdk`
`223`	`216`	`{`