First clang patch
This commit is contained in:
parent
c60fc2406a
commit
838dae4188
|
@ -24,6 +24,7 @@ let
|
|||
rev = "cling-v0.9";
|
||||
sha256 = "sha256-ft1NUIclSiZ9lN3Z3DJCWA0U9q/K1M0TKkZr+PjsFYk=";
|
||||
};
|
||||
# src = /home/tom/tools/clang;
|
||||
|
||||
clingSrc = fetchFromGitHub {
|
||||
owner = "root-project";
|
||||
|
@ -31,6 +32,7 @@ let
|
|||
rev = "v0.9";
|
||||
sha256 = "0wx3fi19wfjcph5kclf8108i436y79ddwakrcf0lgxnnxhdjyd29";
|
||||
};
|
||||
# clingSrc = /home/tom/tools/cling;
|
||||
|
||||
preConfigure = ''
|
||||
echo "add_llvm_external_project(cling)" >> tools/CMakeLists.txt
|
||||
|
@ -41,6 +43,10 @@ let
|
|||
nativeBuildInputs = [ python3 git cmake llvmPackages_9.llvm.dev ];
|
||||
buildInputs = [ libffi llvmPackages_9.llvm zlib ncurses ];
|
||||
|
||||
patches = [
|
||||
./no-clang-cpp.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
|
@ -50,6 +56,8 @@ let
|
|||
# Setting -DCLING_INCLUDE_TESTS=ON causes the cling/tools targets to be built;
|
||||
# see cling/tools/CMakeLists.txt
|
||||
"-DCLING_INCLUDE_TESTS=ON"
|
||||
"-DCLANG-TOOLS=OFF"
|
||||
# "--trace-expand"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
13
pkgs/development/interpreters/cling/no-clang-cpp.patch
Normal file
13
pkgs/development/interpreters/cling/no-clang-cpp.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
|
||||
index 590d708d83..340ae529d4 100644
|
||||
--- a/tools/driver/CMakeLists.txt
|
||||
+++ b/tools/driver/CMakeLists.txt
|
||||
@@ -63,7 +63,7 @@ endif()
|
||||
add_dependencies(clang clang-resource-headers)
|
||||
|
||||
if(NOT CLANG_LINKS_TO_CREATE)
|
||||
- set(CLANG_LINKS_TO_CREATE clang++ clang-cl clang-cpp)
|
||||
+ set(CLANG_LINKS_TO_CREATE clang++ clang-cl)
|
||||
endif()
|
||||
|
||||
foreach(link ${CLANG_LINKS_TO_CREATE})
|
Loading…
Reference in a new issue