swift-lang-4.2-change-lldb-location.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23

--- swift/lib/Driver/ToolChains.cpp.orig	2018-04-12 15:42:53.633440991 -0500
+++ swift/lib/Driver/ToolChains.cpp	2018-04-12 15:44:37.578628169 -0500
@@ -841,10 +841,8 @@
     useLLDB = false;
     break;
   case REPLJobAction::Mode::RequireLLDB:
-    useLLDB = true;
-    break;
   case REPLJobAction::Mode::PreferLLDB:
-    useLLDB = !findProgramRelativeToSwift("lldb").empty();
+    useLLDB = true;
     break;
   }
 
@@ -872,7 +870,7 @@
   ArgStringList Arguments;
   Arguments.push_back(context.Args.MakeArgString(std::move(SingleArg)));
 
-  return {"lldb", Arguments};
+  return {"/usr/libexec/swift-lldb/lldb", Arguments};
 }