Don't add an autolink-extract job unless actually linking ELF/Wasm ob…

…jects, matching the original C++ driver
swiftlang · Nov 10, 2023 · d9a3378 · d9a3378
1 parent eb63540
commit d9a3378
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/Sources/SwiftDriver/Jobs/AutolinkExtractJob.swift b/Sources/SwiftDriver/Jobs/AutolinkExtractJob.swift
@@ -18,7 +18,8 @@ import struct TSCBasic.RelativePath
 // FIXME: Also handle Cygwin and MinGW
 extension Driver {
   /*@_spi(Testing)*/ public var isAutolinkExtractJobNeeded: Bool {
-    [.elf, .wasm].contains(targetTriple.objectFormat) && lto == nil
+    [.elf, .wasm].contains(targetTriple.objectFormat) && lto == nil &&
+    linkerOutputType != nil
   }
 
   mutating func autolinkExtractJob(inputs: [TypedVirtualPath]) throws -> Job? {

diff --git a/Tests/SwiftDriverTests/SwiftDriverTests.swift b/Tests/SwiftDriverTests/SwiftDriverTests.swift
@@ -3358,25 +3358,19 @@ final class SwiftDriverTests: XCTestCase {
       }
     }
 
-    #if os(Linux) || os(Android)
-    let autoLinkExtractJob = 1
-    #else
-    let autoLinkExtractJob = 0
-    #endif
-
     do {
       // non library-evolution builds require a single job, because cross-module-optimization is enabled by default.
       var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "-module-name", "Test", "-emit-module-path", rebase("Test.swiftmodule", at: root), "-c", "-o", rebase("test.o", at: root), "-wmo", "-O" ])
       let plannedJobs = try driver.planBuild()
-      XCTAssertEqual(plannedJobs.count, 1 + autoLinkExtractJob)
+      XCTAssertEqual(plannedJobs.count, 1)
       XCTAssertTrue(plannedJobs[0].commandLine.contains(.flag("-enable-default-cmo")))
     }
 
     do {
       // library-evolution builds can emit the module in a separate job.
       var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "-module-name", "Test", "-emit-module-path", rebase("Test.swiftmodule", at: root), "-c", "-o", rebase("test.o", at: root), "-wmo", "-O", "-enable-library-evolution" ])
       let plannedJobs = try driver.planBuild()
-      XCTAssertEqual(plannedJobs.count, 2 + autoLinkExtractJob)
+      XCTAssertEqual(plannedJobs.count, 2)
       XCTAssertFalse(plannedJobs[0].commandLine.contains(.flag("-enable-default-cmo")))
       XCTAssertFalse(plannedJobs[1].commandLine.contains(.flag("-enable-default-cmo")))
     }
@@ -3385,7 +3379,7 @@ final class SwiftDriverTests: XCTestCase {
       // When disabling cross-module-optimization, the module can be emitted in a separate job.
       var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "-module-name", "Test", "-emit-module-path", rebase("Test.swiftmodule", at: root), "-c", "-o", rebase("test.o", at: root), "-wmo", "-O", "-disable-cmo" ])
       let plannedJobs = try driver.planBuild()
-      XCTAssertEqual(plannedJobs.count, 2 + autoLinkExtractJob)
+      XCTAssertEqual(plannedJobs.count, 2)
       XCTAssertFalse(plannedJobs[0].commandLine.contains(.flag("-enable-default-cmo")))
       XCTAssertFalse(plannedJobs[1].commandLine.contains(.flag("-enable-default-cmo")))
     }
@@ -3394,7 +3388,7 @@ final class SwiftDriverTests: XCTestCase {
       // non optimized builds can emit the module in a separate job.
       var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "-module-name", "Test", "-emit-module-path", rebase("Test.swiftmodule", at: root), "-c", "-o", rebase("test.o", at: root), "-wmo" ])
       let plannedJobs = try driver.planBuild()
-      XCTAssertEqual(plannedJobs.count, 2 + autoLinkExtractJob)
+      XCTAssertEqual(plannedJobs.count, 2)
       XCTAssertFalse(plannedJobs[0].commandLine.contains(.flag("-enable-default-cmo")))
       XCTAssertFalse(plannedJobs[1].commandLine.contains(.flag("-enable-default-cmo")))
     }