blob: 1d399f51d04415ff24dffdd83d40ab5dd15ceef0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
--- swift/lib/Driver/ToolChains.cpp.orig 2018-06-25 21:04:32.467377167 -0500
+++ swift/lib/Driver/ToolChains.cpp 2018-06-25 21:04:57.553375531 -0500
@@ -844,10 +844,8 @@
useLLDB = false;
break;
case REPLJobAction::Mode::RequireLLDB:
- useLLDB = true;
- break;
case REPLJobAction::Mode::PreferLLDB:
- useLLDB = !findProgramRelativeToSwift("lldb").empty();
+ useLLDB = true;
break;
}
@@ -875,7 +873,7 @@
ArgStringList Arguments;
Arguments.push_back(context.Args.MakeArgString(std::move(SingleArg)));
- return {"lldb", Arguments};
+ return {"/usr/libexec/swift-lldb/lldb", Arguments};
}
@@ -1588,8 +1586,13 @@
Clang = context.Args.MakeArgString(toolchainClang.get());
}
if (Clang == nullptr) {
- if (auto pathClang = llvm::sys::findProgramByName("clang++", None))
- Clang = context.Args.MakeArgString(pathClang.get());
+ const char *isBuilding = getenv("SWIFT_BUILD_FOR_FEDORA");
+ if (isBuilding == NULL) {
+ Clang = context.Args.MakeArgString("/usr/libexec/swift-clang/clang++");
+ } else {
+ if (auto pathClang = llvm::sys::findProgramByName("clang++", None))
+ Clang = context.Args.MakeArgString(pathClang.get());
+ }
}
assert(Clang &&
"clang++ was not found in the toolchain directory or system path.");
|
