From 3e430a8ee55813f5d2b128316bf599924f084908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 22 Jun 2017 08:10:08 +0100 Subject: [PATCH] dale: fix linking against llvm libs --- pkgs/development/compilers/dale/default.nix | 2 ++ pkgs/development/compilers/dale/link-llvm.patch | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/development/compilers/dale/link-llvm.patch diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 6d9adaa15181..3538f85a75f8 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -23,6 +23,8 @@ in stdenv.mkDerivation { buildInputs = [ cmake pkgconfig libffi llvm_35 ] ++ stdenv.lib.optional doCheck perl; + patches = [ ./link-llvm.patch ]; + inherit doCheck; checkTarget = "tests"; diff --git a/pkgs/development/compilers/dale/link-llvm.patch b/pkgs/development/compilers/dale/link-llvm.patch new file mode 100644 index 000000000000..3facec91874f --- /dev/null +++ b/pkgs/development/compilers/dale/link-llvm.patch @@ -0,0 +1,10 @@ +--- dale-39e16d8e89fa070de65a673d4462e783d530f95a-src.org/CMakeLists.txt 2017-06-22 08:01:05.839531242 +0100 ++++ dale-39e16d8e89fa070de65a673d4462e783d530f95a-src/CMakeLists.txt 2017-06-22 07:59:11.777566801 +0100 +@@ -78,6 +78,7 @@ + execute_process (COMMAND ${LLVM_CONFIG} --libs + OUTPUT_VARIABLE LLVM_LIBS + OUTPUT_STRIP_TRAILING_WHITESPACE) ++STRING(REGEX REPLACE " " ";" LLVM_LIBS "${LLVM_LIBS}") + if (${D_LLVM_VERSION_MINOR} GREATER 4) + execute_process (COMMAND ${LLVM_CONFIG} --system-libs + OUTPUT_VARIABLE LLVM_SYSTEM_LIBS