Merge pull request #1356 from rintaro/external-plugin-path-rdar109060298

Author: rintaro

Sources/SwiftDriver/Toolchains/DarwinToolchain.swift

@@ -376,6 +376,7 @@ public final class DarwinToolchain: Toolchain {
     // Pass -external-plugin-path if the current toolchain is not a Xcode
     // default toolchain.
     if
+      !driver.integratedDriver,
       driver.isFrontendArgSupported(.externalPluginPath),
       let xcodeDir = try self.findCurrentSelectedXcodeDir(),
       try !self.executableDir.isDescendant(of: xcodeDir),

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -6776,6 +6776,7 @@ final class SwiftDriverTests: XCTestCase {
 
     try withTemporaryDirectory { tmpDir in
       var driver = try Driver(args: ["swiftc", "-typecheck", "foo.swift"],
+                              integratedDriver: false,
                               compilerExecutableDir: tmpDir)
       guard driver.isFrontendArgSupported(.externalPluginPath) else {
         return
@@ -6818,6 +6819,27 @@ final class SwiftDriverTests: XCTestCase {
     }
   }
 
+  func testExternalPluginPathsDisabled() throws {
+#if !os(macOS)
+    throw XCTSkip("Supported only in macOS")
+#endif
+
+    try withTemporaryDirectory { tmpDir in
+      var driver = try Driver(args: ["swiftc", "-typecheck", "foo.swift"],
+                              integratedDriver: true,
+                              compilerExecutableDir: tmpDir)
+      guard driver.isFrontendArgSupported(.externalPluginPath) else {
+        return
+      }
+
+      let jobs = try driver.planBuild().removingAutolinkExtractJobs()
+      XCTAssertEqual(jobs.count, 1)
+      let job = jobs.first!
+
+      XCTAssertFalse(job.commandLine.contains(.flag("-external-plugin-path")))
+    }
+  }
+
   func testClangModuleValidateOnce() throws {
     let flagTest = try Driver(args: ["swiftc", "-typecheck", "foo.swift"])
     guard flagTest.isFrontendArgSupported(.clangBuildSessionFile),