[Build] Remove the need to reference tools build parameters in swift targets

Pass macros associated with a particular swift target as a list
of build descriptions. That was the only users of `tools` build
parameters that are now obsolete.

Author: xedin

Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift

@@ -46,9 +46,6 @@ public final class SwiftTargetBuildDescription {
     /// The build parameters for this target.
     let defaultBuildParameters: BuildParameters
 
-    /// The build parameters for build tools.
-    let toolsBuildParameters: BuildParameters
-
     /// Path to the temporary directory for this target.
     let tempsPath: AbsolutePath
 
@@ -235,7 +232,7 @@ public final class SwiftTargetBuildDescription {
     public let prebuildCommandResults: [PrebuildCommandResult]
 
     /// Any macro products that this target requires to build.
-    public let requiredMacroProducts: [ResolvedProduct]
+    public let requiredMacroProducts: [ProductBuildDescription]
 
     /// ObservabilityScope with which to emit diagnostics
     private let observabilityScope: ObservabilityScope
@@ -253,10 +250,9 @@ public final class SwiftTargetBuildDescription {
         toolsVersion: ToolsVersion,
         additionalFileRules: [FileRuleDescription] = [],
         destinationBuildParameters: BuildParameters,
-        toolsBuildParameters: BuildParameters,
         buildToolPluginInvocationResults: [BuildToolPluginInvocationResult] = [],
         prebuildCommandResults: [PrebuildCommandResult] = [],
-        requiredMacroProducts: [ResolvedProduct] = [],
+        requiredMacroProducts: [ProductBuildDescription] = [],
         testTargetRole: TestTargetRole? = nil,
         shouldGenerateTestObservation: Bool = false,
         shouldDisableSandbox: Bool,
@@ -272,7 +268,6 @@ public final class SwiftTargetBuildDescription {
         self.target = target
         self.toolsVersion = toolsVersion
         self.defaultBuildParameters = destinationBuildParameters
-        self.toolsBuildParameters = toolsBuildParameters
 
         // Unless mentioned explicitly, use the target type to determine if this is a test target.
         if let testTargetRole {
@@ -439,15 +434,15 @@ public final class SwiftTargetBuildDescription {
 
         #if BUILD_MACROS_AS_DYLIBS
         self.requiredMacroProducts.forEach { macro in
-            args += ["-Xfrontend", "-load-plugin-library", "-Xfrontend", self.toolsBuildParameters.binaryPath(for: macro).pathString]
+            args += ["-Xfrontend", "-load-plugin-library", "-Xfrontend", macro.binaryPath.pathString]
         }
         #else
         try self.requiredMacroProducts.forEach { macro in
-            if let macroTarget = macro.targets.first {
-                let executablePath = try self.toolsBuildParameters.binaryPath(for: macro).pathString
+            if let macroTarget = macro.product.targets.first {
+                let executablePath = try macro.binaryPath.pathString
                 args += ["-Xfrontend", "-load-plugin-executable", "-Xfrontend", "\(executablePath)#\(macroTarget.c99name)"]
             } else {
-                throw InternalError("macro product \(macro.name) has no targets") // earlier validation should normally catch this
+                throw InternalError("macro product \(macro.product.name) has no targets") // earlier validation should normally catch this
             }
         }
         #endif

Sources/Build/BuildManifest/LLBuildManifestBuilder+Swift.swift

@@ -486,7 +486,7 @@ extension LLBuildManifestBuilder {
 
         // Depend on any required macro product's output.
         try target.requiredMacroProducts.forEach { macro in
-            try inputs.append(.virtual(macro.getLLBuildTargetName(buildParameters: target.defaultBuildParameters)))
+            try inputs.append(.virtual(macro.getLLBuildTargetName()))
         }
 
         return inputs + additionalInputs

Sources/Build/BuildPlan/BuildPlan+Test.swift

@@ -107,7 +107,6 @@ extension BuildPlan {
                     target: discoveryResolvedTarget,
                     toolsVersion: toolsVersion,
                     destinationBuildParameters: discoveryTargetBuildParameters,
-                    toolsBuildParameters: toolsBuildParameters,
                     testTargetRole: .discovery,
                     shouldDisableSandbox: shouldDisableSandbox,
                     fileSystem: fileSystem,
@@ -157,7 +156,6 @@ extension BuildPlan {
                     target: entryPointResolvedTarget,
                     toolsVersion: toolsVersion,
                     destinationBuildParameters: entryPointBuildParameters,
-                    toolsBuildParameters: toolsBuildParameters,
                     testTargetRole: .entryPoint(isSynthesized: true),
                     shouldDisableSandbox: shouldDisableSandbox,
                     fileSystem: fileSystem,
@@ -203,7 +201,6 @@ extension BuildPlan {
                             target: entryPointResolvedTarget,
                             toolsVersion: toolsVersion,
                             destinationBuildParameters: destinationBuildParameters,
-                            toolsBuildParameters: toolsBuildParameters,
                             testTargetRole: .entryPoint(isSynthesized: false),
                             shouldDisableSandbox: shouldDisableSandbox,
                             fileSystem: fileSystem,
@@ -226,7 +223,6 @@ extension BuildPlan {
                         target: entryPointResolvedTarget,
                         toolsVersion: toolsVersion,
                         destinationBuildParameters: destinationBuildParameters,
-                        toolsBuildParameters: toolsBuildParameters,
                         testTargetRole: .entryPoint(isSynthesized: false),
                         shouldDisableSandbox: shouldDisableSandbox,
                         fileSystem: fileSystem,

Sources/Build/BuildPlan/BuildPlan.swift

@@ -358,7 +358,15 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
 
                 let requiredMacroProducts = try target.recursiveTargetDependencies()
                     .filter { $0.underlying.type == .macro }
-                    .compactMap { macroProductsByTarget[$0.id] }
+                    .compactMap {
+                        guard let product = macroProductsByTarget[$0.id],
+                              let description = productMap[product.id] else
+                        {
+                            throw InternalError("macro product not found for \($0)")
+                        }
+
+                        return description.buildDescription
+                    }
 
                 var generateTestObservation = false
                 if target.type == .test && shouldGenerateTestObservation {
@@ -373,7 +381,6 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
                         toolsVersion: toolsVersion,
                         additionalFileRules: additionalFileRules,
                         destinationBuildParameters: buildParameters,
-                        toolsBuildParameters: toolsBuildParameters,
                         buildToolPluginInvocationResults: buildToolPluginInvocationResults[target.id] ?? [],
                         prebuildCommandResults: prebuildCommandResults[target.id] ?? [],
                         requiredMacroProducts: requiredMacroProducts,