blob: ffecb8996fe870bc0e647ccef26d1d682fd92fe8 (
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
40
41
|
diff -ur llvm-project-apple-stable-20191106/llvm/tools/llvm-config/llvm-config.cpp llvm-project-apple-stable-20191106+iOS/llvm/tools/llvm-config/llvm-config.cpp
--- llvm-project-apple-stable-20191106/llvm/tools/llvm-config/llvm-config.cpp 2019-12-03 19:28:47.000000000 -1000
+++ llvm-project-apple-stable-20191106+iOS/llvm/tools/llvm-config/llvm-config.cpp 2019-12-06 09:02:23.000000000 -1000
@@ -287,15 +287,15 @@
// Check to see if we are inside a development tree by comparing to possible
// locations (prefix style or CMake style).
- if (sys::fs::equivalent(CurrentExecPrefix, LLVM_OBJ_ROOT)) {
+ if (sys::fs::equivalent(CurrentExecPrefix, "/usr/src/llvm/build")) {
IsInDevelopmentTree = true;
DevelopmentTreeLayout = CMakeStyle;
- ActiveObjRoot = LLVM_OBJ_ROOT;
+ ActiveObjRoot = "/usr/src/llvm/build";
} else if (sys::fs::equivalent(sys::path::parent_path(CurrentExecPrefix),
- LLVM_OBJ_ROOT)) {
+ "/usr/src/llvm/build")) {
IsInDevelopmentTree = true;
DevelopmentTreeLayout = CMakeBuildModeStyle;
- ActiveObjRoot = LLVM_OBJ_ROOT;
+ ActiveObjRoot = "/usr/src/llvm/build";
} else {
IsInDevelopmentTree = false;
DevelopmentTreeLayout = CMakeStyle; // Initialized to avoid warnings.
@@ -307,7 +307,7 @@
ActiveCMakeDir;
std::string ActiveIncludeOption;
if (IsInDevelopmentTree) {
- ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include";
+ ActiveIncludeDir = std::string("/usr/src/llvm") + "/include";
ActivePrefix = CurrentExecPrefix;
// CMake organizes the products differently than a normal prefix style
@@ -562,7 +562,7 @@
} else if (Arg == "--obj-root") {
OS << ActivePrefix << '\n';
} else if (Arg == "--src-root") {
- OS << LLVM_SRC_ROOT << '\n';
+ OS << "/usr/src/llvm" << '\n';
} else if (Arg == "--ignore-libllvm") {
LinkDyLib = false;
LinkMode = BuiltSharedLibs ? LinkModeShared : LinkModeAuto;
|
