Merge pull request #1307 from etcwilde/ewilde/driver-gcc-toolchain-flag

Add `-gcc-toolchain` flag to swift-driver
apple · Apr 12, 2023 · 302ab58 · 302ab58
2 parents af9fce4 + 72ed3ac
commit 302ab58
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift b/Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift
@@ -15,6 +15,7 @@ import SwiftOptions
 import class TSCBasic.LocalFileOutputByteStream
 import class TSCBasic.TerminalController
 import struct TSCBasic.RelativePath
+import struct TSCBasic.AbsolutePath
 import var TSCBasic.stderrStream
 
 /// Whether we should produce color diagnostics by default.
@@ -150,6 +151,11 @@ extension Driver {
     try commandLine.appendAll(.F, .Fsystem, from: &parsedOptions)
     try commandLine.appendAll(.vfsoverlay, from: &parsedOptions)
 
+    if let gccToolchain = parsedOptions.getLastArgument(.gccToolchain) {
+        commandLine.appendFlag(.Xcc)
+        commandLine.appendFlag("--gcc-toolchain=\(gccToolchain.asSingle)")
+    }
+
     try commandLine.appendLast(.AssertConfig, from: &parsedOptions)
     try commandLine.appendLast(.autolinkForceLoad, from: &parsedOptions)
 

diff --git a/Sources/SwiftDriver/Jobs/LinkJob.swift b/Sources/SwiftDriver/Jobs/LinkJob.swift
@@ -55,6 +55,11 @@ extension Driver {
       outputFile = try outputFileForImage
     }
 
+    if let gccToolchain = parsedOptions.getLastArgument(.gccToolchain) {
+        commandLine.appendFlag(.XclangLinker)
+        commandLine.appendFlag("--gcc-toolchain=\(gccToolchain.asSingle)")
+    }
+
     // Defer to the toolchain for platform-specific linking
     let linkTool = try toolchain.addPlatformSpecificLinkerArgs(
       to: &commandLine,

diff --git a/Sources/SwiftOptions/Options.swift b/Sources/SwiftOptions/Options.swift
@@ -447,6 +447,7 @@ extension Option {
   public static let Fsystem: Option = Option("-Fsystem", .separate, attributes: [.frontend, .argumentIsPath], helpText: "Add directory to system framework search path")
   public static let functionSections: Option = Option("-function-sections", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Emit functions to separate sections.")
   public static let F: Option = Option("-F", .joinedOrSeparate, attributes: [.frontend, .argumentIsPath], helpText: "Add directory to framework search path")
+  public static let gccToolchain: Option = Option("-gcc-toolchain", .separate, attributes: [.helpHidden, .argumentIsPath], metaVar: "<path>", helpText: "Specify a directory where the clang importer and clang linker can find headers and libraries")
   public static let gdwarfTypes: Option = Option("-gdwarf-types", .flag, attributes: [.frontend], helpText: "Emit full DWARF type info.", group: .g)
   public static let generateEmptyBaseline: Option = Option("-generate-empty-baseline", .flag, attributes: [.noDriver], helpText: "Generate an empty baseline")
   public static let generateEmptyBaseline_: Option = Option("--generate-empty-baseline", .flag, alias: Option.generateEmptyBaseline, attributes: [.noDriver], helpText: "Generate an empty baseline")
@@ -1219,6 +1220,7 @@ extension Option {
       Option.Fsystem,
       Option.functionSections,
       Option.F,
+      Option.gccToolchain,
       Option.gdwarfTypes,
       Option.generateEmptyBaseline,
       Option.generateEmptyBaseline_,

diff --git a/Tests/SwiftDriverTests/SwiftDriverTests.swift b/Tests/SwiftDriverTests/SwiftDriverTests.swift
@@ -6688,6 +6688,18 @@ final class SwiftDriverTests: XCTestCase {
 #endif
   }
 
+  func testGccToolchainFlags() throws {
+      VirtualPath.resetTemporaryFileStore()
+      var driver = try Driver(args: [
+        "swiftc", "-gcc-toolchain", "foo/as/blarpy", "test.swift"
+      ])
+      let jobs = try driver.planBuild().removingAutolinkExtractJobs()
+      XCTAssertEqual(jobs.count, 2)
+      let (compileJob, linkJob) = (jobs[0], jobs[1])
+      compileJob.commandLine.contains(.flag("--gcc-toolchain=foo/as/blarpy"))
+      linkJob.commandLine.contains(.flag("--gcc-toolchain=foo/as/blarpy"))
+  }
+
   func testPluginPaths() throws {
     var driver = try Driver(args: ["swiftc", "-typecheck", "foo.swift"])
     guard driver.isFrontendArgSupported(.pluginPath) else {