Fix build errors after rebase

Author: MaxDesiatov

Sources/PackageGraph/Resolution/ResolvedProduct.swift

@@ -39,6 +39,9 @@ public struct ResolvedProduct: Hashable {
     /// The list of platforms that are supported by this product.
     public let supportedPlatforms: [SupportedPlatform]
 
+    /// Triple for which this resolved product should be compiled for.
+    public let buildTriple: BuildTriple
+
     public let platformVersionProvider: PlatformVersionProvider
 
     /// The main executable target of product.
@@ -60,11 +63,24 @@ public struct ResolvedProduct: Hashable {
 
     public init(product: Product, targets: [ResolvedTarget]) {
         assert(product.targets.count == targets.count && product.targets.map(\.name) == targets.map(\.name))
-        let (supportedPlatforms, platformVersionProvider) = Self.computePlatforms(targets: targets)
         let defaultLocalization = targets.first?.defaultLocalization
-        
+
+        let processedTargets: [ResolvedTarget]
+        if product.type == .macro || product.type == .plugin {
+            self.buildTriple = .buildTools
+            processedTargets = targets.map(\.buildToolsTarget)
+        } else {
+            self.buildTriple = .buildProducts
+            processedTargets = targets
+        }
+
         self.underlying = product
-        self.targets = targets
+        self.targets = processedTargets
+
+        let (supportedPlatforms, platformVersionProvider) = Self.computePlatforms(targets: targets)
+        self.supportedPlatforms = supportedPlatforms
+        self.platformVersionProvider = platformVersionProvider
+        
         self.testEntryPointTarget = product.testEntryPointPath.map { testEntryPointPath in
             // Create an executable resolved target with the entry point file, adding product's targets as dependencies.
             let dependencies: [Target.Dependency] = product.targets.map { .target($0, conditions: []) }
@@ -88,8 +104,6 @@ public struct ResolvedProduct: Hashable {
         // defaultLocalization is currently shared across the entire package
         // this may need to be enhanced if / when we support localization per target or product
         self.defaultLocalization = defaultLocalization
-        self.supportedPlatforms = supportedPlatforms
-        self.platformVersionProvider = platformVersionProvider
     }
 
     /// True if this product contains Swift targets.

Sources/PackageGraph/Resolution/ResolvedTarget.swift

@@ -74,7 +74,7 @@ public struct ResolvedTarget: Hashable {
             switch self {
             case let .product(product, conditions):
                 let targets = product.targets.map(\.buildToolsTarget)
-                let buildToolsProduct = ResolvedProduct(product: product.underlyingProduct, targets: targets)
+                let buildToolsProduct = ResolvedProduct(product: product.underlying, targets: targets)
                 return .product(buildToolsProduct, conditions: conditions)
 
             case let .target(target, conditions):
@@ -84,7 +84,7 @@ public struct ResolvedTarget: Hashable {
     }
 
     /// Triple for which this resolved target should be compiled for.
-    public let buildTriple: BuildTriple
+    public private(set) var buildTriple: BuildTriple
 
     /// The name of this target.
     public var name: String {
@@ -169,7 +169,7 @@ public struct ResolvedTarget: Hashable {
         let triple: BuildTriple
 
         let processedDependencies: [Dependency]
-        if target.type == .macro || target.type == .plugin {
+        if underlying.type == .macro || underlying.type == .plugin {
             triple = .buildTools
             processedDependencies = dependencies.map(\.buildToolsDependency)
         } else {
@@ -182,6 +182,7 @@ public struct ResolvedTarget: Hashable {
         self.defaultLocalization = defaultLocalization
         self.supportedPlatforms = supportedPlatforms
         self.platformVersionProvider = platformVersionProvider
+        self.buildTriple = triple
     }
 
 
@@ -191,6 +192,16 @@ public struct ResolvedTarget: Hashable {
             for: platform,
             usingXCTest: usingXCTest
         )
+    }    
+
+    /// A copy of this resolved target compiled for the build tools triple.
+    var buildToolsTarget: ResolvedTarget {
+        guard self.buildTriple != .buildTools else { return self }
+
+        var result = self
+        result.buildTriple = .buildTools
+
+        return result
     }
 }