Skip to content

Specify -clang-target only when explicit module is on #762

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 15, 2021
Merged

Specify -clang-target only when explicit module is on #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,10 @@ extension Driver {

// Pass down -clang-target.
// If not specified otherwise, we should use the same triple as -target
// TODO: enable -clang-target for implicit module build as well.
if !parsedOptions.hasArgument(.disableClangTarget) &&
isFrontendArgSupported(.clangTarget) {
isFrontendArgSupported(.clangTarget) &&
parsedOptions.contains(.driverExplicitModuleBuild) {
let clangTriple = parsedOptions.getLastArgument(.clangTarget)?.asSingle ?? targetTriple.triple
commandLine.appendFlag(.clangTarget)
commandLine.appendFlag(clangTriple)
Expand Down
48 changes: 35 additions & 13 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2490,23 +2490,45 @@ final class SwiftDriverTests: XCTestCase {
}
}

func testClangTarget() throws {
var driver = try Driver(args: ["swiftc", "-target",
"x86_64-apple-macosx10.14", "foo.swift", "bar.swift"])
guard driver.isFrontendArgSupported(.clangTarget) else {
throw XCTSkip("Skipping: compiler does not support '-clang-target'")
func testClangTargetForExplicitModule() throws {
// Check -clang-target is on by defualt when explicit module is on.
try withTemporaryDirectory { path in
let main = path.appending(component: "Foo.swift")
try localFileSystem.writeFileContents(main) {
$0 <<< "import Swift"
}
var driver = try Driver(args: ["swiftc", "-experimental-explicit-module-build", "-target",
"x86_64-apple-macosx10.14", main.pathString])
guard driver.isFrontendArgSupported(.clangTarget) else {
throw XCTSkip("Skipping: compiler does not support '-clang-target'")
}
let plannedJobs = try driver.planBuild()
XCTAssertTrue(plannedJobs.contains { job in
job.commandLine.contains(.flag("-clang-target"))
})
}
// Check -disable-clang-target works
try withTemporaryDirectory { path in
let main = path.appending(component: "Foo.swift")
try localFileSystem.writeFileContents(main) {
$0 <<< "import Swift"
}
var driver = try Driver(args: ["swiftc", "-disable-clang-target",
"-experimental-explicit-module-build", "-target",
"x86_64-apple-macosx10.14", main.pathString])
guard driver.isFrontendArgSupported(.clangTarget) else {
throw XCTSkip("Skipping: compiler does not support '-clang-target'")
}
let plannedJobs = try driver.planBuild()
XCTAssertFalse(plannedJobs.contains { job in
job.commandLine.contains(.flag("-clang-target"))
})
}
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 3)
XCTAssert(plannedJobs[0].commandLine.contains(.flag("-target")))
XCTAssert(plannedJobs[0].commandLine.contains(.flag("-clang-target")))
XCTAssert(plannedJobs[1].commandLine.contains(.flag("-target")))
XCTAssert(plannedJobs[1].commandLine.contains(.flag("-clang-target")))
}

func testDisableClangTarget() throws {
func testDisableClangTargetForImplicitModule() throws {
var driver = try Driver(args: ["swiftc", "-target",
"x86_64-apple-macosx10.14", "foo.swift", "-disable-clang-target"])
"x86_64-apple-macosx10.14", "foo.swift"])
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 2)
XCTAssert(plannedJobs[0].commandLine.contains(.flag("-target")))
Expand Down