Skip to content

[Explicit Module Builds] Pass in -fno-implicit-module-maps for pre-building Clang explicit dependencies #780

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 30, 2021
Merged

[Explicit Module Builds] Pass in -fno-implicit-module-maps for pre-building Clang explicit dependencies #780

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
2 changes: 1 addition & 1 deletion Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public typealias ExternalTargetModulePathMap = [ModuleDependencyId: AbsolutePath
commandLine: inout [Job.ArgTemplate]) throws {
// Prohibit the frontend from implicitly building textual modules into binary modules.
commandLine.appendFlags("-disable-implicit-swift-modules", "-Xcc", "-Xclang", "-Xcc",
"-fno-implicit-modules")
"-fno-implicit-modules", "-Xcc", "-Xclang", "-Xcc", "-fno-implicit-module-maps")
var swiftDependencyArtifacts: [SwiftModuleArtifactInfo] = []
var clangDependencyArtifacts: [ClangModuleArtifactInfo] = []
try addModuleDependencies(moduleId: moduleId, pcmArgs: pcmArgs,
Expand Down
2 changes: 2 additions & 0 deletions Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ throws {
// Ensure the frontend was prohibited from doing implicit module builds
XCTAssertTrue(job.commandLine.contains(.flag(String("-disable-implicit-swift-modules"))))
XCTAssertTrue(job.commandLine.contains(.flag(String("-fno-implicit-modules"))))
XCTAssertTrue(job.commandLine.contains(.flag(String("-fno-implicit-module-maps"))))

try checkExplicitModuleBuildJobDependencies(job: job, pcmArgs: downstreamPCMArgs,
moduleInfo: moduleInfo,
dependencyGraph: dependencyGraph,
Expand Down