about summary refs log tree commit diff
path: root/pkgs/development/compilers/llvm
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2019-09-03 21:24:40 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2019-09-03 21:24:40 +0200
commite3434a3c36354328edae4893424fc313c96684b8 (patch)
tree32980f3ce36ecb4b1f59060af807542646e141c7 /pkgs/development/compilers/llvm
parentaafc6d09e7f3400a9df145010cc4af7106a8ae81 (diff)
downloadnixlib-e3434a3c36354328edae4893424fc313c96684b8.tar
nixlib-e3434a3c36354328edae4893424fc313c96684b8.tar.gz
nixlib-e3434a3c36354328edae4893424fc313c96684b8.tar.bz2
nixlib-e3434a3c36354328edae4893424fc313c96684b8.tar.lz
nixlib-e3434a3c36354328edae4893424fc313c96684b8.tar.xz
nixlib-e3434a3c36354328edae4893424fc313c96684b8.tar.zst
nixlib-e3434a3c36354328edae4893424fc313c96684b8.zip
llvm_4: fix build with gcc8
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r--pkgs/development/compilers/llvm/4/llvm.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index ea70382d2ac7..8ba94bb12626 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -46,6 +46,14 @@ stdenv.mkDerivation (rec {
 
   propagatedBuildInputs = [ ncurses zlib ];
 
+  patches = [
+    (fetchpatch {
+      name = "0001-Fix-return-type-in-ORC-readMem-client-interface.patch";
+      url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687";
+      sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch";
+    })
+  ];
+
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
   # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd