commit 58348302fd3476a4e280d07dff86ed512600e5f1
author Mishal Shah <shahmishal@users.noreply.github.com> Mon Mar 04 18:37:14 2019 -0800
committer GitHub <noreply@github.com> Mon Mar 04 18:37:14 2019 -0800
tree 9b00fd37b862c3ecaf8146d3224146d017557ac3
parent 15148f182e59d5f576ec90f6473911928a1d7a57
parent d2472017630416326b8930981df673c3817c34cf

Merge pull request #23078 from benlangmuir/spm-pre-50

[5.0] [swiftpm] Add preset for SwiftPM Linux build

lib/Driver/DarwinToolChains.cpp

diff --git a/lib/Driver/DarwinToolChains.cpp b/lib/Driver/DarwinToolChains.cpp
index 0ece134..1e26ab8 100644
--- a/lib/Driver/DarwinToolChains.cpp
+++ b/lib/Driver/DarwinToolChains.cpp
@@ -169,7 +169,9 @@
 
   auto xcrunPath = llvm::sys::findProgramByName("xcrun");
   if (!xcrunPath.getError()) {
-    const char *args[] = {"-f", "clang", nullptr};
+    // Explicitly ask for the default toolchain so that we don't find a Clang
+    // included with an open-source toolchain.
+    const char *args[] = {"-toolchain", "default", "-f", "clang", nullptr};
     sys::TaskQueue queue;
     queue.addTask(xcrunPath->c_str(), args, /*Env=*/llvm::None,
                   /*Context=*/nullptr,