Use -print-target-info instead of a hardcoded triple

Author: neonichu

Sources/PackageLoading/ManifestLoader.swift

@@ -592,6 +592,7 @@ public final class ManifestLoader: ManifestLoaderProtocol {
         }
     }
 
+    private static var _hostTriple: Triple?
     private static var _packageDescriptionMinimumDeploymentTarget: String?
 
     /// Parse the manifest at the given path to JSON.
@@ -660,11 +661,15 @@ public final class ManifestLoader: ManifestLoaderProtocol {
 
             // Use the same minimum deployment target as the PackageDescription library (with a fallback of 10.15).
             #if os(macOS)
+            if Self._hostTriple == nil {
+                Self._hostTriple = Triple.getHostTriple(usingSwiftCompiler: resources.swiftCompiler.pathString)
+            }
+            let triple = Self._hostTriple!
             if Self._packageDescriptionMinimumDeploymentTarget == nil {
                 Self._packageDescriptionMinimumDeploymentTarget = (try MinimumDeploymentTarget.computeMinimumDeploymentTarget(of: macOSPackageDescriptionPath))?.versionString ?? "10.15"
             }
             let version = Self._packageDescriptionMinimumDeploymentTarget!
-            cmd += ["-target", "x86_64-apple-macosx\(version)"]
+            cmd += ["-target", "\(triple)\(version)"]
             #endif
 
             cmd += compilerFlags

Sources/SPMBuildCore/CMakeLists.txt

@@ -11,8 +11,7 @@ add_library(SPMBuildCore
   BuildSystem.swift
   BuiltTestProduct.swift
   Sanitizers.swift
-  Toolchain.swift
-  Triple.swift)
+  Toolchain.swift)
 # NOTE(compnerd) workaround for CMake not setting up include flags yet
 set_target_properties(SPMBuildCore PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})

swift-tools-support-core/Sources/TSCUtility/CMakeLists.txt

@@ -32,6 +32,7 @@ add_library(TSCUtility
   SimplePersistence.swift
   StringExtensions.swift
   StringMangling.swift
+  Triple.swift
   URL.swift
   Verbosity.swift
   Version.swift