Merge pull request #838 from xymus/pass-sdk-name

Pass the canonical SDK name to the frontend for swiftmodule checking

Author: xymus

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -291,7 +291,8 @@ extension Driver {
 
     try toolchain.addPlatformSpecificCommonFrontendOptions(commandLine: &commandLine,
                                                            inputs: &inputs,
-                                                           frontendTargetInfo: frontendTargetInfo)
+                                                           frontendTargetInfo: frontendTargetInfo,
+                                                           driver: self)
   }
 
   mutating func addFrontendSupplementaryOutputArguments(commandLine: inout [Job.ArgTemplate],

Sources/SwiftDriver/Toolchains/DarwinToolchain.swift

@@ -339,7 +339,8 @@ public final class DarwinToolchain: Toolchain {
   public func addPlatformSpecificCommonFrontendOptions(
     commandLine: inout [Job.ArgTemplate],
     inputs: inout [TypedVirtualPath],
-    frontendTargetInfo: FrontendTargetInfo
+    frontendTargetInfo: FrontendTargetInfo,
+    driver: Driver
   ) throws {
     guard let sdkPath = frontendTargetInfo.sdkPath?.path,
           let sdkInfo = getTargetSDKInfo(sdkPath: sdkPath) else { return }
@@ -351,6 +352,12 @@ public final class DarwinToolchain: Toolchain {
       commandLine.append(.flag("-target-variant-sdk-version"))
       commandLine.append(.flag(sdkInfo.sdkVersion(for: targetVariantTriple).description))
     }
+
+    if driver.isFrontendArgSupported(.targetSdkName) {
+      commandLine.append(.flag(Option.targetSdkName.spelling))
+      commandLine.append(.flag(sdkInfo.canonicalName))
+    }
+
     // We should be able to pass down prebuilt module dir for all other SDKs.
     // For macCatalyst, doing so is specifically necessary because -target-sdk-version
     // doesn't always match the macosx sdk version so the compiler may fail to find

Sources/SwiftDriver/Toolchains/Toolchain.swift

@@ -96,7 +96,8 @@ public protocol Toolchain {
   func addPlatformSpecificCommonFrontendOptions(
     commandLine: inout [Job.ArgTemplate],
     inputs: inout [TypedVirtualPath],
-    frontendTargetInfo: FrontendTargetInfo
+    frontendTargetInfo: FrontendTargetInfo,
+    driver: Driver
   ) throws
 
   var dummyForTestingObjectFormat: Triple.ObjectFormat {get}
@@ -220,7 +221,8 @@ extension Toolchain {
   public func addPlatformSpecificCommonFrontendOptions(
     commandLine: inout [Job.ArgTemplate],
     inputs: inout [TypedVirtualPath],
-    frontendTargetInfo: FrontendTargetInfo
+    frontendTargetInfo: FrontendTargetInfo,
+    driver: Driver
   ) throws {}
 }
 

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -3091,6 +3091,12 @@ final class SwiftDriverTests: XCTestCase {
           .flag("-target-sdk-version"),
           .flag("10.15.0")
         ]))
+        if driver.isFrontendArgSupported(.targetSdkName) {
+          XCTAssertTrue(frontendJobs[0].commandLine.contains(subsequence: [
+            .flag("-target-sdk-name"),
+            .flag("macosx10.15"),
+          ]))
+        }
         XCTAssertEqual(frontendJobs[1].kind, .link)
         XCTAssertTrue(frontendJobs[1].commandLine.contains(subsequence: [
           .flag("-platform_version"),
@@ -3141,6 +3147,12 @@ final class SwiftDriverTests: XCTestCase {
           .flag("-target-variant-sdk-version"),
           .flag("13.4.0")
         ]))
+        if driver.isFrontendArgSupported(.targetSdkName) {
+          XCTAssertTrue(frontendJobs[0].commandLine.contains(subsequence: [
+            .flag("-target-sdk-name"),
+            .flag("macosx10.15.4"),
+          ]))
+        }
         XCTAssertEqual(frontendJobs[1].kind, .link)
         XCTAssertTrue(frontendJobs[1].commandLine.contains(subsequence: [
           .flag("-platform_version"),