Skip to content

Make module map generation conditional #2891

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
shahmishal merged 1 commit into from
Sep 1, 2020
Merged

Make module map generation conditional #2891

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
29 changes: 18 additions & 11 deletions Sources/XCBuildSupport/PIFBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {

let generatedModuleMapDir = "$(OBJROOT)/GeneratedModuleMaps/$(PLATFORM_NAME)"
let moduleMapFile = "\(generatedModuleMapDir)/\(target.name).modulemap"
let moduleMapFileContents: String
let moduleMapFileContents: String?

if let clangTarget = target.underlyingTarget as? ClangTarget {
// Let the target itself find its own headers.
Expand All @@ -572,15 +572,20 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {

// Also propagate this search path to all direct and indirect clients.
impartedSettings[.HEADER_SEARCH_PATHS, default: ["$(inherited)"]].append(clangTarget.includeDir.pathString)
impartedSettings[.OTHER_SWIFT_FLAGS, default: ["$(inherited)"]] +=
["-Xcc", "-fmodule-map-file=\(moduleMapFile)"]

moduleMapFileContents = """
module \(target.c99name) {
umbrella "\(clangTarget.includeDir.pathString)"
export *
}
"""
if !fileSystem.exists(clangTarget.moduleMapPath) {
impartedSettings[.OTHER_SWIFT_FLAGS, default: ["$(inherited)"]] +=
["-Xcc", "-fmodule-map-file=\(moduleMapFile)"]

moduleMapFileContents = """
module \(target.c99name) {
umbrella "\(clangTarget.includeDir.pathString)"
export *
}
"""
} else {
moduleMapFileContents = nil
}
} else if let swiftTarget = target.underlyingTarget as? SwiftTarget {
settings[.SWIFT_VERSION] = swiftTarget.swiftVersion.description
// Generate ObjC compatibility header for Swift library targets.
Expand All @@ -597,8 +602,10 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
fatalError("unexpected target")
}

settings[.MODULEMAP_PATH] = moduleMapFile
settings[.MODULEMAP_FILE_CONTENTS] = moduleMapFileContents
if let moduleMapFileContents = moduleMapFileContents {
settings[.MODULEMAP_PATH] = moduleMapFile
settings[.MODULEMAP_FILE_CONTENTS] = moduleMapFileContents
}

// Pass the path of the module map up to all direct and indirect clients.
impartedSettings[.OTHER_CFLAGS, default: ["$(inherited)"]].append("-fmodule-map-file=\(moduleMapFile)")
Expand Down