Address review feedback

Author: rauhul

Package.swift

@@ -154,7 +154,7 @@ let package = Package(
                 .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
                 .product(name: "SystemPackage", package: "swift-system"),
             ],
-            exclude: ["CMakeLists.txt"]
+            exclude: ["CMakeLists.txt", "Vendor/README.md"]
         ),
 
         .target(

Sources/Basics/Vendor/README.md

@@ -0,0 +1,16 @@
+#  README
+
+The Triple.swift and Triple+Platform.swift files in this directory have been
+vendored from SwiftDriver. The purpose of this approach is to avoid
+introducing a dependency on Driver in the "data model" section of SwiftPM,
+which could currently lead to complications with the Xcode integration.
+
+In the long term, our goal is to consolidate this code into a shared
+implementation that can be utilized by both SwiftPM and SwiftDriver through a
+package. However, until we reach that point, it is important to keep the files
+in this directory up to date by incorporating any relevant additions from the
+original copies.
+
+Moreover, it is crucial to note that any modifications made to these files
+should be first applied to the original files in SwiftDriver, and then copied
+over to this directory to maintain synchronization.

Sources/Basics/Vendor/Triple+Platforms.swift

@@ -13,8 +13,7 @@
 //===----------------------------------------------------------------------===//
 //
 // Warning: This file has been copied with minimal modifications from
-// swift-driver to avoid a direct dependency (for now). Any modification to this
-// file, must first be made in the original file, then copied here.
+// swift-driver to avoid a direct dependency. See Vendor/README.md for details.
 //
 // Changes:
 // - Replaced usage of `\(_:or:)` string interpolation.

Sources/Basics/Vendor/Triple.swift

@@ -13,8 +13,7 @@
 //===----------------------------------------------------------------------===//
 //
 // Warning: This file has been copied with minimal modifications from
-// swift-driver to avoid a direct dependency (for now). Any modification to this
-// file, must first be made in the original file, then copied here.
+// swift-driver to avoid a direct dependency. See Vendor/README.md for details.
 //
 // Changes:
 // - Replaced usage of `\(_:or:)` string interpolation.

Sources/PackageModel/UserToolchain.swift

@@ -716,32 +716,32 @@ public final class UserToolchain: Toolchain {
                 // (~5.7), we always had a singular installed SDK.  Prefer the
                 // new variant which has an architecture subdirectory in `bin`
                 // if available.
-                switch triple.archName.lowercased() {
-                case "x86_64", "x86_64h":
+                switch triple.arch { // Name.lowercased() {
+                case .x86_64: // amd64 x86_64 x86_64h
                     let path: AbsolutePath =
                         xctest.appending("usr")
                             .appending("bin64")
                     if localFileSystem.exists(path) {
                         return path
                     }
 
-                case "i686":
+                case .x86: // i386 i486 i586 i686 i786 i886 i986
                     let path: AbsolutePath =
                         xctest.appending("usr")
                             .appending("bin32")
                     if localFileSystem.exists(path) {
                         return path
                     }
 
-                case "armv7":
+                case .arm: // armv7 and many more
                     let path: AbsolutePath =
                         xctest.appending("usr")
                             .appending("bin32a")
                     if localFileSystem.exists(path) {
                         return path
                     }
 
-                case "arm64":
+                case .aarch64: // aarch6 arm64
                     let path: AbsolutePath =
                         xctest.appending("usr")
                             .appending("bin64a")