From 38ac67fc9a2d6555c9134a661ba5939f825ee4e7 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 10 Nov 2017 19:16:11 +0000 Subject: llvm_34: fix build with glibc 2.26 --- pkgs/development/compilers/llvm/3.4/llvm.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 743f243791b6..6e7ef22392b1 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , perl , groff , cmake @@ -39,6 +40,22 @@ in stdenv.mkDerivation rec { ../fix-llvm-config.patch ]; + postPatch = stdenv.lib.optionalString (stdenv ? glibc) '' + ( + cd projects/compiler-rt + patch -p1 -F3 < ${ + fetchpatch { + name = "sigaltstack.patch"; # for glibc-2.26 + url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; + sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; + } + } + + sed -i "s,#include ,&\n#include ,g" \ + lib/asan/asan_linux.cc + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ -- cgit 1.4.1 From b261c73dced6ad52262d48d1a8f4c427012a4a0b Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 10 Nov 2017 19:16:26 +0000 Subject: llvm_35: fix build with glibc 2.26 --- pkgs/development/compilers/llvm/3.5/llvm.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 94f39183345f..26144e38619f 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , perl , groff , cmake @@ -39,6 +40,22 @@ in stdenv.mkDerivation rec { --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" ''; + postPatch = stdenv.lib.optionalString (stdenv ? glibc) '' + ( + cd projects/compiler-rt + patch -p1 < ${ + fetchpatch { + name = "sigaltstack.patch"; # for glibc-2.26 + url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; + sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; + } + } + + sed -i "s,#include ,&\n#include ,g" \ + lib/asan/asan_linux.cc + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ -- cgit 1.4.1