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

[Dependency Scanning] Add forgotten '-Xcc' qualifier to modulemap dependency flags

Browse Source 
Resolves rdar://128945712
This commit is contained in:
artemcm
2024-05-30 11:14:30 -07:00
parent 319f36b01b
commit 60af9b8b93
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/DependencyScan/ScanDependencies.cpp
View File

@@ -271,7 +271,8 @@ static llvm::Error resolveExplicitModuleInputs(
auto optionalBridgingHeaderDepModuleInfo = cache.findKnownDependency(
{bridgingHeaderDepName, ModuleDependencyKind::Clang});
const auto bridgingHeaderDepModuleDetails =
optionalBridgingHeaderDepModuleInfo.getAsClangModule();
optionalBridgingHeaderDepModuleInfo.getAsClangModule();
commandLine.push_back("-Xcc");
commandLine.push_back(
"-fmodule-map-file=" +
remapPath(bridgingHeaderDepModuleDetails->moduleMapFile));

13
test/ScanDependencies/bridging_header_dep_module_map.swift
View File

@@ -49,7 +49,18 @@
// CHECK-DAG: "clang": "Dart"
// CHECK: ],
// CHECK: "commandLine": [
// CHECK: "-fmodule-map-file={{.*}}{{/|\\}}CHeaders{{/|\\}}module.modulemap"
// CHECK: "-Xcc"
// CHECK-NEXT: "-fno-implicit-modules"
// CHECK: "-Xcc"
// CHECK-NEXT: "-fno-implicit-module-maps"
// CHECK-DAG: "-Xcc",
// CHECK-NEXT: "-fmodule-file=Dart={{.*}}"
// CHECK-DAG: "-Xcc"
// CHECK-NEXT: "-fmodule-map-file={{.*}}{{/|\\}}CHeaders{{/|\\}}module.modulemap"
// CHECK-DAG: "-Xcc",
// CHECK-NEXT: "-fmodule-file=SwiftShims={{.*}}"
// CHECK-DAG: "-Xcc",
// CHECK-NEXT: "-fmodule-file=X={{.*}}"
// CHECK-NOT: "-fmodule-map-file={{.*}}{{/|\\}}TestCHeaders{{/|\\}}module.modulemap"
// CHECK: ]