Use versioned host triples for non-Darwin platforms

Only Darwin platforms have the property of defaulting to the manifest-specified version in the target triple. For other platforms, revert to the previous behavior of including the version.

Author: jakepetroules

Sources/Basics/Triple+Basics.swift

@@ -86,15 +86,15 @@ extension Triple {
 
     /// Determine the versioned host triple using the Swift compiler.
     public static func getVersionedHostTriple(usingSwiftCompiler swiftCompiler: AbsolutePath) throws -> Triple {
-        try Self.getHostTriple(usingSwiftCompiler: swiftCompiler, versioned: true)
+        try Self.getHostTriple(usingSwiftCompiler: swiftCompiler).versionedTriple
     }
 
     /// Determine the unversioned host triple using the Swift compiler.
     public static func getUnversionedHostTriple(usingSwiftCompiler swiftCompiler: AbsolutePath) throws -> Triple {
-        try Self.getHostTriple(usingSwiftCompiler: swiftCompiler, versioned: false)
+        try Self.getHostTriple(usingSwiftCompiler: swiftCompiler).unversionedTriple
     }
 
-    private static func getHostTriple(usingSwiftCompiler swiftCompiler: AbsolutePath, versioned: Bool) throws -> Triple {
+    public static func getHostTriple(usingSwiftCompiler swiftCompiler: AbsolutePath) throws -> (versionedTriple: Triple, unversionedTriple: Triple) {
         // Call the compiler to get the target info JSON.
         let compilerOutput: String
         do {
@@ -113,9 +113,11 @@ extension Triple {
             )
         }
         // Get the triple string from the parsed JSON.
-        let tripleString: String
+        let versionedTripleString: String
+        let unversionedTripleString: String
         do {
-            tripleString = try parsedTargetInfo.get("target").get(versioned ? "triple" : "unversionedTriple")
+            versionedTripleString = try parsedTargetInfo.get("target").get("triple")
+            unversionedTripleString = try parsedTargetInfo.get("target").get("unversionedTriple")
         } catch {
             throw InternalError(
                 "Target info does not contain a triple string (\(error.interpolationDescription)).\nTarget info: \(parsedTargetInfo)"
@@ -124,10 +126,10 @@ extension Triple {
 
         // Parse the triple string.
         do {
-            return try Triple(tripleString)
+            return try (Triple(versionedTripleString), Triple(unversionedTripleString))
         } catch {
             throw InternalError(
-                "Failed to parse triple string (\(error.interpolationDescription)).\nTriple string: \(tripleString)"
+                "Failed to parse triple string (\(error.interpolationDescription)).\nVersioned triple string: \(versionedTripleString), unversioned triple string \(unversionedTripleString)"
             )
         }
     }

Sources/SPMBuildCore/BuildParameters/BuildParameters.swift

@@ -173,8 +173,13 @@ public struct BuildParameters: Encodable {
         testingParameters: Testing = .init(),
         apiDigesterMode: APIDigesterMode? = nil
     ) throws {
-        // Default to the unversioned triple if none is provided so that we defer to the package's requested deployment target.
-        let triple = try triple ?? .getUnversionedHostTriple(usingSwiftCompiler: toolchain.swiftCompilerPath)
+        // Default to the unversioned triple if none is provided so that we defer to the package's requested deployment target, for Darwin platforms. For other platforms, continue to include the version since those don't have the concept of a package-specified version, and the version is meaningful for some platforms including Android and FreeBSD.
+        let triple = try triple ?? {
+            let hostTriple = try Triple.getHostTriple(
+                    usingSwiftCompiler: toolchain.swiftCompilerPath)
+            return hostTriple.versionedTriple.isDarwin() ? hostTriple.unversionedTriple : hostTriple.versionedTriple
+        }()
+
         self.debuggingParameters = debuggingParameters ?? .init(
             triple: triple,
             shouldEnableDebuggingEntitlement: configuration == .debug,