Skip to content

Commit 57d0a55

Browse files
authored
Revert "Swift SDKs: fix toolset.linker.path not passed to -ld-path (#6719)" (#6939)
This reverts commit d328002. This broke existing Swift SDKs: ``` ld.lld: error: unable to find library -ld-path=/Users/neonacho/Library/org.swift.swiftpm/swift-sdks/5.8-RELEASE_rhel_ubi9_aarch64.artifactbundle/5.8-RELEASE_rhel_ubi9_aarch64/aarch64-unknown-linux-gnu/swift.xctoolchain/usr/bin/ld.lld ```
1 parent 6d2a772 commit 57d0a55

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

Sources/PackageModel/UserToolchain.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -347,11 +347,7 @@ public final class UserToolchain: Toolchain {
347347
swiftSDK: SwiftSDK,
348348
environment: EnvironmentVariables
349349
) throws -> [String] {
350-
var swiftCompilerFlags = swiftSDK.toolset.knownTools[.swiftCompiler]?.extraCLIOptions ?? []
351-
352-
if let linker = swiftSDK.toolset.knownTools[.linker]?.path {
353-
swiftCompilerFlags += ["-ld-path=\(linker)"]
354-
}
350+
let swiftCompilerFlags = swiftSDK.toolset.knownTools[.swiftCompiler]?.extraCLIOptions ?? []
355351

356352
guard let sdkDir = swiftSDK.pathsConfiguration.sdkRootPath else {
357353
if triple.isWindows() {

Tests/BuildTests/BuildPlanTests.swift

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3700,7 +3700,7 @@ final class BuildPlanTests: XCTestCase {
37003700
.cxxCompiler: .init(extraCLIOptions: [jsonFlag(tool: .cxxCompiler)]),
37013701
.swiftCompiler: .init(extraCLIOptions: [jsonFlag(tool: .swiftCompiler)]),
37023702
.librarian: .init(path: "/fake/toolchain/usr/bin/librarian"),
3703-
.linker: .init(path: "/fake/toolchain/usr/bin/linker", extraCLIOptions: [jsonFlag(tool: .linker)]),
3703+
.linker: .init(extraCLIOptions: [jsonFlag(tool: .linker)]),
37043704
],
37053705
rootPaths: try UserToolchain.default.swiftSDK.toolset.rootPaths)
37063706
let targetTriple = try Triple("armv7em-unknown-none-macho")
@@ -3781,9 +3781,7 @@ final class BuildPlanTests: XCTestCase {
37813781
// Compile Swift Target
37823782
let exeCompileArguments = try result.target(for: "exe").swiftTarget().compileArguments()
37833783
let exeCompileArgumentsPattern: [StringPattern] = [
3784-
jsonFlag(tool: .swiftCompiler),
3785-
"-ld-path=/fake/toolchain/usr/bin/linker",
3786-
"-g", cliFlag(tool: .swiftCompiler),
3784+
jsonFlag(tool: .swiftCompiler), "-g", cliFlag(tool: .swiftCompiler),
37873785
.anySequence,
37883786
"-Xcc", jsonFlag(tool: .cCompiler), "-Xcc", "-g", "-Xcc", cliFlag(tool: .cCompiler),
37893787
// TODO: Pass -Xcxx flags to swiftc (#6491)
@@ -3806,9 +3804,7 @@ final class BuildPlanTests: XCTestCase {
38063804
// Link Product
38073805
let exeLinkArguments = try result.buildProduct(for: "exe").linkArguments()
38083806
let exeLinkArgumentsPattern: [StringPattern] = [
3809-
jsonFlag(tool: .swiftCompiler),
3810-
"-ld-path=/fake/toolchain/usr/bin/linker",
3811-
"-g", cliFlag(tool: .swiftCompiler),
3807+
jsonFlag(tool: .swiftCompiler), "-g", cliFlag(tool: .swiftCompiler),
38123808
.anySequence,
38133809
"-Xlinker", jsonFlag(tool: .linker), "-Xlinker", cliFlag(tool: .linker),
38143810
]

0 commit comments

Comments
 (0)