pyrox.dev
lol
First clang patch
+8
pkgs/development/interpreters/cling/default.nix
+8
pkgs/development/interpreters/cling/default.nix
···
24
24
rev = "cling-v0.9";
25
25
sha256 = "sha256-ft1NUIclSiZ9lN3Z3DJCWA0U9q/K1M0TKkZr+PjsFYk=";
26
26
};
27
+
# src = /home/tom/tools/clang;
27
28
28
29
clingSrc = fetchFromGitHub {
29
30
owner = "root-project";
···
31
32
rev = "v0.9";
32
33
sha256 = "0wx3fi19wfjcph5kclf8108i436y79ddwakrcf0lgxnnxhdjyd29";
33
34
};
35
+
# clingSrc = /home/tom/tools/cling;
34
36
35
37
preConfigure = ''
36
38
echo "add_llvm_external_project(cling)" >> tools/CMakeLists.txt
···
41
43
nativeBuildInputs = [ python3 git cmake llvmPackages_9.llvm.dev ];
42
44
buildInputs = [ libffi llvmPackages_9.llvm zlib ncurses ];
43
45
46
+
patches = [
47
+
./no-clang-cpp.patch
48
+
];
49
+
44
50
strictDeps = true;
45
51
46
52
cmakeFlags = [
···
50
56
# Setting -DCLING_INCLUDE_TESTS=ON causes the cling/tools targets to be built;
51
57
# see cling/tools/CMakeLists.txt
52
58
"-DCLING_INCLUDE_TESTS=ON"
59
+
"-DCLANG-TOOLS=OFF"
60
+
# "--trace-expand"
53
61
];
54
62
55
63
meta = with lib; {
+13
pkgs/development/interpreters/cling/no-clang-cpp.patch
+13
pkgs/development/interpreters/cling/no-clang-cpp.patch
···
1
+
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
2
+
index 590d708d83..340ae529d4 100644
3
+
--- a/tools/driver/CMakeLists.txt
4
+
+++ b/tools/driver/CMakeLists.txt
5
+
@@ -63,7 +63,7 @@ endif()
6
+
add_dependencies(clang clang-resource-headers)
7
+
8
+
if(NOT CLANG_LINKS_TO_CREATE)
9
+
- set(CLANG_LINKS_TO_CREATE clang++ clang-cl clang-cpp)
10
+
+ set(CLANG_LINKS_TO_CREATE clang++ clang-cl)
11
+
endif()
12
+
13
+
foreach(link ${CLANG_LINKS_TO_CREATE})