Merge pull request #151 from DougGregor/print-target-info-all-the-args

Pass the SDK path and resource directory through to -print-target-info.

Author: DougGregor

Sources/SwiftDriver/Driver/Driver.swift

@@ -143,7 +143,9 @@ public struct Driver {
   public let incrementalCompilation: IncrementalCompilation
 
   /// The path of the SDK.
-  public let sdkPath: String?
+  public var sdkPath: String? {
+    frontendTargetInfo.paths.sdkPath
+  }
 
   /// The path to the imported Objective-C header.
   public let importedObjCHeader: VirtualPath?
@@ -251,9 +253,14 @@ public struct Driver {
     self.optionTable = OptionTable()
     self.parsedOptions = try optionTable.parse(Array(args), for: self.driverKind)
 
+    // Determine the compilation mode.
+    self.compilerMode = try Self.computeCompilerMode(&parsedOptions, driverKind: driverKind, diagnosticsEngine: diagnosticEngine)
+
+    // Build the toolchain and determine target information.
     (self.toolchain, self.frontendTargetInfo, self.swiftCompilerPrefixArgs) =
         try Self.computeToolchain(
-          &self.parsedOptions, diagnosticsEngine: diagnosticEngine, env: env,
+          &self.parsedOptions, diagnosticsEngine: diagnosticEngine,
+          compilerMode: self.compilerMode, env: env,
           executor: self.executor, fileSystem: fileSystem)
 
     // Compute the working directory.
@@ -296,9 +303,6 @@ public struct Driver {
       self.outputFileMap = outputFileMap
     }
 
-    // Determine the compilation mode.
-    self.compilerMode = try Self.computeCompilerMode(&parsedOptions, driverKind: driverKind, diagnosticsEngine: diagnosticEngine)
-
     // Figure out the primary outputs from the driver.
     (self.compilerOutputType, self.linkerOutputType) = Self.determinePrimaryOutputs(&parsedOptions, driverKind: driverKind, diagnosticsEngine: diagnosticEngine)
 
@@ -333,8 +337,6 @@ public struct Driver {
     // Local variable to alias the target triple, because self.targetTriple
     // is not available until the end of this initializer.
     let targetTriple = self.frontendTargetInfo.target.triple
-    self.sdkPath = Self.computeSDKPath(&parsedOptions, compilerMode: compilerMode, toolchain: toolchain, targetTriple: targetTriple,
-        fileSystem: fileSystem, diagnosticsEngine: diagnosticEngine, env: env)
 
     self.importedObjCHeader = try Self.computeImportedObjCHeader(&parsedOptions, compilerMode: compilerMode, diagnosticEngine: diagnosticEngine)
     self.bridgingPrecompiledHeader = try Self.computeBridgingPrecompiledHeader(&parsedOptions,
@@ -1411,25 +1413,20 @@ extension Driver {
     _ parsedOptions: inout ParsedOptions,
     compilerMode: CompilerMode,
     toolchain: Toolchain,
-    targetTriple: Triple,
+    targetTriple: Triple?,
     fileSystem: FileSystem,
     diagnosticsEngine: DiagnosticsEngine,
     env: [String: String]
-  ) -> String? {
+  ) -> VirtualPath? {
     var sdkPath: String?
 
     if let arg = parsedOptions.getLastArgument(.sdk) {
       sdkPath = arg.asSingle
     } else if let SDKROOT = env["SDKROOT"] {
       sdkPath = SDKROOT
     } else if compilerMode == .immediate || compilerMode == .repl {
-      if targetTriple.isMacOSX == true {
-        // In immediate modes, use the SDK provided by xcrun.
-        // This will prefer the SDK alongside the Swift found by "xcrun swift".
-        // We don't do this in compilation modes because defaulting to the
-        // latest SDK may not be intended.
-        sdkPath = try? toolchain.defaultSDKPath()?.pathString
-      }
+      // In immediate modes, query the toolchain for a default SDK.
+      sdkPath = try? toolchain.defaultSDKPath(targetTriple)?.pathString
     }
 
     // An empty string explicitly clears the SDK.
@@ -1451,16 +1448,18 @@ extension Driver {
         path = AbsolutePath(sdkPath, relativeTo: cwd)
       } else {
         diagnosticsEngine.emit(.warning_no_such_sdk(sdkPath))
-        return sdkPath
+        return nil
       }
 
       if !fileSystem.exists(path) {
         diagnosticsEngine.emit(.warning_no_such_sdk(sdkPath))
       }
       // .. else check if SDK is too old (we need target triple to diagnose that).
+
+      return .absolute(path)
     }
 
-    return sdkPath
+    return nil
   }
 }
 
@@ -1570,6 +1569,7 @@ extension Driver {
   static func computeToolchain(
     _ parsedOptions: inout ParsedOptions,
     diagnosticsEngine: DiagnosticsEngine,
+    compilerMode: CompilerMode,
     env: [String: String],
     executor: DriverExecutor,
     fileSystem: FileSystem
@@ -1583,9 +1583,13 @@ extension Driver {
         Triple($0, normalizing: true)
       }
 
-    // FIXME: Compute these.
-    let sdkPath: VirtualPath? = nil
-    let resourceDirPath: VirtualPath? = nil
+    // Determine the resource directory.
+    let resourceDirPath: VirtualPath?
+    if let resourceDirArg = parsedOptions.getLastArgument(.resourceDir) {
+      resourceDirPath = try VirtualPath(path: resourceDirArg.asSingle)
+    } else {
+      resourceDirPath = nil
+    }
 
     let toolchainType = try explicitTarget?.toolchainType(diagnosticsEngine) ??
           defaultToolchainType
@@ -1609,6 +1613,12 @@ extension Driver {
       swiftCompilerPrefixArgs = []
     }
 
+    // Find the SDK, if any.
+    let sdkPath: VirtualPath? = Self.computeSDKPath(
+      &parsedOptions, compilerMode: compilerMode, toolchain: toolchain,
+      targetTriple: explicitTarget, fileSystem: fileSystem,
+      diagnosticsEngine: diagnosticsEngine, env: env)
+
     // Query the frontend to for target information.
     var info = try executor.execute(
         job: toolchain.printTargetInfoJob(

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -178,6 +178,11 @@ extension Driver {
       commandLine.appendPath(.absolute(workingDirectory))
     }
 
+    // Resource directory.
+    commandLine.appendFlag(.resourceDir)
+    commandLine.appendPath(
+      try AbsolutePath(validating: frontendTargetInfo.paths.runtimeResourcePath))
+
     // -g implies -enable-anonymous-context-mangled-names, because the extra
     // metadata aids debugging.
     if parsedOptions.getLast(in: .g) != nil {

Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift

@@ -72,6 +72,8 @@ public struct FrontendTargetInfo: Codable {
   }
 
   struct Paths: Codable {
+    /// The path to the SDK, if provided.
+    let sdkPath: String?
     let runtimeLibraryPaths: [String]
     let runtimeLibraryImportPaths: [String]
     let runtimeResourcePath: String

Sources/SwiftDriver/Toolchains/DarwinToolchain.swift

@@ -120,12 +120,23 @@ public final class DarwinToolchain: Toolchain {
     resourcesDirectory.map { $0.appending(RelativePath("../clang/lib/darwin/libclang_rt.osx.a")) }
   }
 
-  public func defaultSDKPath() throws -> AbsolutePath? {
-    let result = try executor.checkNonZeroExit(
-      args: "xcrun", "-sdk", "macosx", "--show-sdk-path",
-      environment: env
-    ).spm_chomp()
-    return AbsolutePath(result)
+  public func defaultSDKPath(_ target: Triple?) throws -> AbsolutePath? {
+    let hostIsMacOS: Bool
+    #if os(macOS)
+    hostIsMacOS = true
+    #else
+    hostIsMacOS = false
+    #endif
+
+    if target?.isMacOSX == true || hostIsMacOS {
+      let result = try executor.checkNonZeroExit(
+        args: "xcrun", "-sdk", "macosx", "--show-sdk-path",
+        environment: env
+      ).spm_chomp()
+      return AbsolutePath(result)
+    }
+
+    return nil
   }
 
   public var shouldStoreInvocationInDebugInfo: Bool {

Sources/SwiftDriver/Toolchains/GenericUnixToolchain.swift

@@ -78,7 +78,7 @@ public final class GenericUnixToolchain: Toolchain {
     toolPaths[tool] = path
   }
 
-  public func defaultSDKPath() throws -> AbsolutePath? {
+  public func defaultSDKPath(_ target: Triple?) throws -> AbsolutePath? {
     return nil
   }
 

Sources/SwiftDriver/Toolchains/Toolchain.swift

@@ -45,7 +45,7 @@ public protocol Toolchain {
   func overrideToolPath(_ tool: Tool, path: AbsolutePath)
 
   /// Returns path of the default SDK, if there is one.
-  func defaultSDKPath() throws -> AbsolutePath?
+  func defaultSDKPath(_ target: Triple?) throws -> AbsolutePath?
 
   /// When the compiler invocation should be stored in debug information.
   var shouldStoreInvocationInDebugInfo: Bool { get }