Skip to content

Commit 54488bc

Browse files
authored
Merge pull request #74030 from artemcm/60ForgottenXccForModMapFlags
[6.0 🍒][Dependency Scanning] Add forgotten '-Xcc' qualifier to modulemap dependency flags
2 parents 38df64a + 2fc453d commit 54488bc

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

lib/DependencyScan/ScanDependencies.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,8 @@ static llvm::Error resolveExplicitModuleInputs(
270270
auto optionalBridgingHeaderDepModuleInfo = cache.findKnownDependency(
271271
{bridgingHeaderDepName, ModuleDependencyKind::Clang});
272272
const auto bridgingHeaderDepModuleDetails =
273-
optionalBridgingHeaderDepModuleInfo.getAsClangModule();
273+
optionalBridgingHeaderDepModuleInfo.getAsClangModule();
274+
commandLine.push_back("-Xcc");
274275
commandLine.push_back(
275276
"-fmodule-map-file=" +
276277
remapPath(bridgingHeaderDepModuleDetails->moduleMapFile));

test/ScanDependencies/bridging_header_dep_module_map.swift

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,18 @@
4949
// CHECK-DAG: "clang": "Dart"
5050
// CHECK: ],
5151
// CHECK: "commandLine": [
52-
// CHECK: "-fmodule-map-file={{.*}}{{/|\\}}CHeaders{{/|\\}}module.modulemap"
52+
// CHECK: "-Xcc"
53+
// CHECK-NEXT: "-fno-implicit-modules"
54+
// CHECK: "-Xcc"
55+
// CHECK-NEXT: "-fno-implicit-module-maps"
56+
// CHECK-DAG: "-Xcc",
57+
// CHECK-NEXT: "-fmodule-file=Dart={{.*}}"
58+
// CHECK-DAG: "-Xcc"
59+
// CHECK-NEXT: "-fmodule-map-file={{.*}}{{/|\\}}CHeaders{{/|\\}}module.modulemap"
60+
// CHECK-DAG: "-Xcc",
61+
// CHECK-NEXT: "-fmodule-file=SwiftShims={{.*}}"
62+
// CHECK-DAG: "-Xcc",
63+
// CHECK-NEXT: "-fmodule-file=X={{.*}}"
5364
// CHECK-NOT: "-fmodule-map-file={{.*}}{{/|\\}}TestCHeaders{{/|\\}}module.modulemap"
5465
// CHECK: ]
5566

0 commit comments

Comments
 (0)