Explicit target dependency check needs to take into account conditionals (#5786)

neonichu · web-flow · commit a5973ecc8f08 · 2022-09-28T11:20:15.000-07:00
This ensures we're erroring when there's an import of a module that is excluded via a target conditional in the package manifest.

rdar://81587673
diff --git a/Sources/Build/BuildOperationBuildSystemDelegateHandler.swift b/Sources/Build/BuildOperationBuildSystemDelegateHandler.swift
@@ -336,7 +336,7 @@ public struct BuildDescription: Codable {
         self.copyCommands = copyCommands
         self.explicitTargetDependencyImportCheckingMode = plan.buildParameters.explicitTargetDependencyImportCheckingMode
         self.targetDependencyMap = try plan.targets.reduce(into: [TargetName: [TargetName]]()) {
-            let deps = try $1.target.recursiveTargetDependencies().map { $0.c99name }
+            let deps = try $1.target.recursiveDependencies(satisfying: plan.buildParameters.buildEnvironment).compactMap { $0.target }.map { $0.c99name }
             $0[$1.target.c99name] = deps
         }
         var targetCommandLines: [TargetName: [CommandLineFlag]] = [:]

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ public struct BuildDescription: Codable {`
`336`	`336`	`self.copyCommands = copyCommands`
`337`	`337`	`self.explicitTargetDependencyImportCheckingMode = plan.buildParameters.explicitTargetDependencyImportCheckingMode`
`338`	`338`	`self.targetDependencyMap = try plan.targets.reduce(into: [TargetName: [TargetName]]()) {`
`339`		`- let deps = try $1.target.recursiveTargetDependencies().map { $0.c99name }`
	`339`	`+ let deps = try $1.target.recursiveDependencies(satisfying: plan.buildParameters.buildEnvironment).compactMap { $0.target }.map { $0.c99name }`
`340`	`340`	`$0[$1.target.c99name] = deps`
`341`	`341`	`}`
`342`	`342`	`var targetCommandLines: [TargetName: [CommandLineFlag]] = [:]`