From da265aebaf04fb10506220a741de66af3ff3e143 Mon Sep 17 00:00:00 2001 From: Evan Wilde Date: Wed, 29 May 2024 13:24:23 -0700 Subject: [PATCH] Fix dash count to fuse-ld `-fuse-ld` only has one dash, while `--ld-path` has two. We should pass them down correctly. --- .../SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift | 4 ++-- Tests/SwiftDriverTests/SwiftDriverTests.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift index e25bc6f6e..7dd18400a 100644 --- a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift +++ b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift @@ -50,9 +50,9 @@ extension GenericUnixToolchain { case .executable: // Select the linker to use. if let arg = parsedOptions.getLastArgument(.useLd)?.asSingle { - commandLine.appendFlag("--fuse-ld=\(arg)") + commandLine.appendFlag("-fuse-ld=\(arg)") } else if lto != nil { - commandLine.appendFlag("--fuse-ld=lld") + commandLine.appendFlag("-fuse-ld=lld") } if let arg = parsedOptions.getLastArgument(.ldPath)?.asSingle { diff --git a/Tests/SwiftDriverTests/SwiftDriverTests.swift b/Tests/SwiftDriverTests/SwiftDriverTests.swift index 0933168f4..5df03848e 100644 --- a/Tests/SwiftDriverTests/SwiftDriverTests.swift +++ b/Tests/SwiftDriverTests/SwiftDriverTests.swift @@ -2372,7 +2372,7 @@ final class SwiftDriverTests: XCTestCase { let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs() let lastJob = plannedJobs.last! XCTAssertTrue(lastJob.tool.name.contains("clang")) - XCTAssertTrue(lastJob.commandLine.contains(.flag("--fuse-ld=lld"))) + XCTAssertTrue(lastJob.commandLine.contains(.flag("-fuse-ld=lld"))) } }