Skip to content

Commit f673bf6

Browse files
authored
Revert "Really fix duplicate module maps this time." (#8517)
Reverts #8498 Broke swift-foundation build.
1 parent 0b23073 commit f673bf6

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Sources/Build/BuildPlan/BuildPlan+Swift.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ extension BuildPlan {
2020
func plan(swiftTarget: SwiftModuleBuildDescription) throws {
2121
// We need to iterate recursive dependencies because Swift compiler needs to see all the targets a target
2222
// builds against
23-
for case .module(let dependency, let description) in swiftTarget.recursiveLinkDependencies(using: self) {
23+
for case .module(let dependency, let description) in swiftTarget.recursiveDependencies(using: self) {
2424
switch dependency.underlying {
2525
case let underlyingTarget as ClangModule where underlyingTarget.type == .library:
2626
guard case let .clang(target)? = description else {

Tests/BuildTests/BuildPlanTests.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -6972,7 +6972,8 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
69726972
XCTAssertNoDiagnostics(observability.diagnostics)
69736973

69746974
let myLib = try XCTUnwrap(plan.targets.first(where: { $0.module.name == "MyLib" })).swift()
6975-
XCTAssertFalse(myLib.additionalFlags.contains(where: { $0.contains("-tool")}), "flags shouldn't contain tools items")
6975+
print(myLib.additionalFlags)
6976+
XCTAssertFalse(myLib.additionalFlags.contains(where: { $0.contains("-tool/include")}), "flags shouldn't contain tools items")
69766977
}
69776978
}
69786979

0 commit comments

Comments
 (0)