averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72668 from artemcm/DepScanBinaryModuleHeaderDepModuleDeps

Browse Source 
[Explicit Module Builds] Only specify '-fmodule-map-file' for bridging header Clang module dependencies
This commit is contained in:
Artem Chikin
2024-03-29 09:02:10 -07:00
committed by GitHub
parent 706f065deb f3816e0335
commit d9c00d8dd6
10 changed files with 85 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -1847,8 +1847,8 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
}
// Pass down -explicit-swift-module-map-file
StringRef explicitSwiftModuleMap = searchPathOpts.ExplicitSwiftModuleMap;
genericSubInvocation.getSearchPathOptions().ExplicitSwiftModuleMap =
StringRef explicitSwiftModuleMap = searchPathOpts.ExplicitSwiftModuleMapPath;
genericSubInvocation.getSearchPathOptions().ExplicitSwiftModuleMapPath =
explicitSwiftModuleMap.str();
// Pass down VFSOverlay flags (do not need to inherit the options because
@@ -2198,6 +2198,7 @@ struct ExplicitSwiftModuleLoader::Implementation {
for (auto &entry : ExplicitClangModuleMap) {
const auto &moduleMapPath = entry.getValue().moduleMapPath;
if (!moduleMapPath.empty() &&
entry.getValue().isBridgingHeaderDependency &&
moduleMapsSeen.find(moduleMapPath) == moduleMapsSeen.end()) {
moduleMapsSeen.insert(moduleMapPath);
extraClangArgs.push_back(