Merge pull request #1054 from compnerd/undeveloped

SwiftDriver: unlearn about `DEVELOPER_DIR`

Author: compnerd

Sources/SwiftDriver/Toolchains/Toolchain.swift

@@ -230,14 +230,6 @@ extension Toolchain {
       return try lookup(executable: executableName("swift"))
     } else if fallbackToExecutableDefaultPath {
       if self is WindowsToolchain {
-        if let DEVELOPER_DIR = env["DEVELOPER_DIR"] {
-          return AbsolutePath(DEVELOPER_DIR)
-                    .appending(component: "Toolchains")
-                    .appending(component: "unknown-Asserts-development.xctoolchain")
-                    .appending(component: "usr")
-                    .appending(component: "bin")
-                    .appending(component: executableName(executable))
-        }
         return try getToolPath(.swiftCompiler)
                 .parentDirectory
                 .appending(component: executable)

Sources/SwiftDriver/Toolchains/WindowsToolchain.swift

@@ -109,21 +109,9 @@ extension WindowsToolchain.ToolchainValidationError {
   }
 
   public func defaultSDKPath(_ target: Triple?) throws -> AbsolutePath? {
-    // The SDKROOT environment always takes precedent.  If SDKROOT is undefined,
-    // but we have DEVELOPER_DIR defined and a valid triple, compose the SDK
-    // root relative to the DEVELOPER_DIR.  The SDKs are always laid out as
-    // `[DeveloperDir]\Platforms\[OS].platform\Developer\SDKs\[OS].sdk`,
-    // allowing us to locate it relative to the DEVELOPER_DIR environment
-    // variable.
-
     // TODO(compnerd): replicate the SPM processing of the SDKInfo.plist
     if let SDKROOT = env["SDKROOT"] {
       return AbsolutePath(SDKROOT)
-    } else if let DEVELOPER_DIR = env["DEVELOPER_DIR"], let os = target?.os?.rawValue {
-      // FIXME(compnerd) we should capitalise the OS name, e.g. windows ->
-      // Windows; we get away with this for now as Windows has a
-      // case-insensitive file system.
-      return AbsolutePath("\(DEVELOPER_DIR)\\Platforms\\\(os).platform\\Developer\\SDKs\\\(os).sdk")
     }
     return nil
   }

Tests/TestUtilities/DriverExtensions.swift

@@ -48,8 +48,6 @@ private let cachedSDKPath: Result<String, Error>? = {
   #if os(Windows)
   if let sdk = ProcessEnv.vars["SDKROOT"] {
     return Result{sdk}
-  } else if let root = ProcessEnv.vars["DEVELOPER_DIR"] {
-    return Result{"\(root)\\Platforms\\Windows.platform\\Developer\\SDKs\\Windows.sdk"}
   }
   // Assume that if neither of the environment variables are set, we are
   // using a build-tree version of the swift frontend, and so we do not set