Compute the host triple using -print-target-info and use it to resolve location of the scanning library.

Author: artemcm

Sources/SwiftDriver/Driver/Driver.swift

@@ -124,6 +124,9 @@ public struct Driver {
   /// The target triple.
   @_spi(Testing) public var targetTriple: Triple { frontendTargetInfo.target.triple }
 
+  /// The host environment triple.
+  @_spi(Testing) public let hostTriple: Triple
+
   /// The variant target triple.
   var targetVariantTriple: Triple? {
     frontendTargetInfo.targetVariant?.triple
@@ -385,6 +388,12 @@ public struct Driver {
           executor: self.executor, fileSystem: fileSystem,
           useStaticResourceDir: self.useStaticResourceDir)
 
+    // Compute the host machine's triple
+    self.hostTriple =
+      try Self.computeHostTriple(toolchain: self.toolchain,
+                                 executor: self.executor,
+                                 swiftCompilerPrefixArgs: self.swiftCompilerPrefixArgs)
+
     // Classify and collect all of the input files.
     let inputFiles = try Self.collectInputFiles(&self.parsedOptions)
     self.inputFiles = inputFiles
@@ -2081,6 +2090,17 @@ extension Driver {
   static let defaultToolchainType: Toolchain.Type = GenericUnixToolchain.self
   #endif
 
+  static func computeHostTriple(toolchain: Toolchain,
+                                executor: DriverExecutor,
+                                swiftCompilerPrefixArgs: [String]) throws -> Triple {
+    return try executor.execute(
+      job: toolchain.printTargetInfoJob(target: nil, targetVariant: nil,
+                                        swiftCompilerPrefixArgs: swiftCompilerPrefixArgs),
+      capturingJSONOutputAs: FrontendTargetInfo.self,
+      forceResponseFiles: false,
+      recordedInputModificationDates: [:]).target.triple
+  }
+
   static func computeToolchain(
     _ parsedOptions: inout ParsedOptions,
     diagnosticsEngine: DiagnosticsEngine,

Sources/SwiftDriver/ExplicitModuleBuilds/ModuleDependencyScanning.swift

@@ -96,8 +96,7 @@ internal extension Driver {
     if (!parsedOptions.hasArgument(.driverScanDependenciesNonLib)) {
       try interModuleDependencyOracle
         .verifyOrCreateScannerInstance(fileSystem: fileSystem,
-                                       swiftScanLibPath: try getScanLibPath(of: toolchain,
-                                                                            target: targetTriple))
+                                       swiftScanLibPath: try getScanLibPath(of: toolchain))
       let cwd = workingDirectory ?? fileSystem.currentWorkingDirectory!
       var command = try itemizedJobCommand(of: scannerJob,
                                            forceResponseFiles: forceResponseFiles,
@@ -130,8 +129,7 @@ internal extension Driver {
     if (!parsedOptions.hasArgument(.driverScanDependenciesNonLib)) {
       try interModuleDependencyOracle
         .verifyOrCreateScannerInstance(fileSystem: fileSystem,
-                                       swiftScanLibPath: try getScanLibPath(of: toolchain,
-                                                                            target: targetTriple))
+                                       swiftScanLibPath: try getScanLibPath(of: toolchain))
       let cwd = workingDirectory ?? fileSystem.currentWorkingDirectory!
       var command = try itemizedJobCommand(of: batchScanningJob,
                                            forceResponseFiles: forceResponseFiles,
@@ -264,16 +262,16 @@ internal extension Driver {
 }
 
 @_spi(Testing) public extension Driver {
-  func getScanLibPath(of toolchain: Toolchain, target: Triple) throws -> AbsolutePath {
+  func getScanLibPath(of toolchain: Toolchain) throws -> AbsolutePath {
     let sharedLibExt: String
-    if target.isMacOSX {
+    if hostTriple.isMacOSX {
       sharedLibExt = ".dylib"
     } else {
       sharedLibExt = ".so"
     }
     return try getRootPath(of: toolchain).appending(component: "lib")
       .appending(component: "swift")
-      .appending(component: target.osNameUnversioned)
+      .appending(component: hostTriple.osNameUnversioned)
       .appending(component: "lib_InternalSwiftScan" + sharedLibExt)
   }
 

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

@@ -163,8 +163,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
       let dependencyOracle = InterModuleDependencyOracle()
       try dependencyOracle
         .verifyOrCreateScannerInstance(fileSystem: localFileSystem,
-                                       swiftScanLibPath: try driver.getScanLibPath(of: driver.toolchain,
-                                                                                   target: driver.targetTriple))
+                                       swiftScanLibPath: try driver.getScanLibPath(of: driver.toolchain))
       try dependencyOracle.mergeModules(from: moduleDependencyGraph)
       driver.explicitDependencyBuildPlanner =
         try ExplicitDependencyBuildPlanner(dependencyGraph: moduleDependencyGraph,
@@ -233,8 +232,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
                               interModuleDependencyOracle: dependencyOracle)
       try dependencyOracle
         .verifyOrCreateScannerInstance(fileSystem: localFileSystem,
-                                       swiftScanLibPath: try driver.getScanLibPath(of: driver.toolchain,
-                                                                                   target: driver.targetTriple))
+                                       swiftScanLibPath: try driver.getScanLibPath(of: driver.toolchain))
 
       // Plan explicit dependency jobs, after resolving placeholders to actual dependencies.
       try moduleDependencyGraph.resolvePlaceholderDependencies(for: (targetModulePathMap, [:]),
@@ -521,8 +519,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
     let dependencyOracle = InterModuleDependencyOracle()
     try dependencyOracle
       .verifyOrCreateScannerInstance(fileSystem: localFileSystem,
-                                     swiftScanLibPath: try driver.getScanLibPath(of: driver.toolchain,
-                                                                                 target: driver.targetTriple))
+                                     swiftScanLibPath: try driver.getScanLibPath(of: driver.toolchain))
 
     // Create a simple test case.
     try withTemporaryDirectory { path in
@@ -547,14 +544,14 @@ final class ExplicitModuleBuildTests: XCTestCase {
       // Here purely to dump diagnostic output in a reasonable fashion when things go wrong.
       let lock = NSLock()
 
-      // Module `X` is only imported when:
+      // Module `X` is only imported on Darwin when:
       // #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 110000
       let expectedNumberOfDependencies: Int
       if driver.targetTriple.isMacOSX,
-         driver.targetTriple.version(for: .macOS) < Triple.Version(11, 0, 0) {
-        expectedNumberOfDependencies = 12
-      } else {
+         driver.targetTriple.version(for: .macOS) >= Triple.Version(11, 0, 0) {
         expectedNumberOfDependencies = 11
+      } else {
+        expectedNumberOfDependencies = 12
       }
 
       // Dispatch several iterations in parallel