Remove previous isRuntimeCompatible implementation

apple · Sep 19, 2023 · 3c3422a · 3c3422a
1 parent 45c0cff
commit 3c3422a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/Sources/Basics/Triple+Basics.swift b/Sources/Basics/Triple+Basics.swift
@@ -114,14 +114,6 @@ extension Triple {
             )
         }
     }
-
-    public func isRuntimeCompatible(with triple: Triple) -> Bool {
-        guard self.isMacOSX, let version = self._macOSVersion, let comparedVersion = triple._macOSVersion else {
-            return self.tripleString == triple.tripleString
-        }
-
-        return version >= comparedVersion
-    }
 }
 
 extension Triple {

diff --git a/Sources/PackageModel/SwiftSDKBundle.swift b/Sources/PackageModel/SwiftSDKBundle.swift
@@ -428,8 +428,17 @@ extension [SwiftSDKBundle] {
         for bundle in self {
             for (artifactID, variants) in bundle.artifacts {
                 for variant in variants {
-                    guard variant.metadata.supportedTriples.contains(where: { 
-                        hostTriple.isRuntimeCompatible(with: $0) 
+                    guard variant.metadata.supportedTriples.contains(where: { variantTriple in
+                        if
+                            hostTriple.arch == variantTriple.arch &&
+                            hostTriple.vendor == variantTriple.vendor &&
+                            hostTriple.os == variantTriple.os &&
+                            hostTriple.environment == variantTriple.environment
+                        {
+                            return hostTriple.osVersion >= variantTriple.osVersion
+                        } else {
+                            return false
+                        }
                     }) else {
                         continue
                     }