Merge pull request swiftlang#1069 from nkcsgexi/less-lazy-var

PrebuiltModules: avoid exposing private iosMac framework paths. NFC

Author: nkcsgexi

Sources/SwiftDriver/Driver/Driver.swift

@@ -355,20 +355,13 @@ public struct Driver {
     return VirtualPath.lookup(rawSdkPath)
   } ()
 
-  lazy var iosMacFrameworksBase: VirtualPath = {
+  lazy var iosMacFrameworksSearchPath: VirtualPath = {
     sdkPath!
       .appending(component: "System")
       .appending(component: "iOSSupport")
       .appending(component: "System")
       .appending(component: "Library")
-  } ()
-
-  lazy var iosMacFrameworksSearchPath: VirtualPath = {
-    iosMacFrameworksBase.appending(component: "Frameworks")
-  } ()
-
-  lazy var iosMacPrivateFrameworksSearchPath: VirtualPath = {
-    iosMacFrameworksBase.appending(component: "PrivateFrameworks")
+      .appending(component: "Frameworks")
   } ()
 
   lazy var abiDescriptorPath: TypedVirtualPath? = {

Sources/SwiftDriver/Jobs/PrebuiltModulesJob.swift

@@ -598,7 +598,8 @@ extension Driver {
       commandLine.append(.path(iosMacFrameworksSearchPath))
       if isInternal {
         commandLine.appendFlag(.Fsystem)
-        commandLine.append(.path(iosMacPrivateFrameworksSearchPath))
+        commandLine.append(.path(iosMacFrameworksSearchPath.parentDirectory
+          .appending(component: "PrivateFrameworks")))
       }
     }
     if isInternal {