Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add -gcc-toolchain flag to swift-driver #1307

Merged
merged 1 commit into from
Apr 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
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.
Expand Down Expand Up @@ -141,6 +142,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)

Expand Down
5 changes: 5 additions & 0 deletions Sources/SwiftDriver/Jobs/LinkJob.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions Sources/SwiftOptions/Options.swift
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,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")
Expand Down Expand Up @@ -1188,6 +1189,7 @@ extension Option {
Option.Fsystem,
Option.functionSections,
Option.F,
Option.gccToolchain,
Option.gdwarfTypes,
Option.generateEmptyBaseline,
Option.generateEmptyBaseline_,
Expand Down
12 changes: 12 additions & 0 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6650,6 +6650,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 {
Expand Down