Merge remote-tracking branch 'origin/master' into hardened-stdenv

Fixes #17801 and #17802.
2016-08-17 19:42:58 +02:00
parent e0f124a9f8 963d8cc3e0
commit b4cc9bd63a
97 changed files with 1201 additions and 407 deletions
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -14,7 +14,7 @@
 , compiler-rt_src
 , libcxxabi
 , debugVersion ? false
-, enableSharedLibraries ? !stdenv.isDarwin
+, enableSharedLibraries ? true
 }:

 let
@@ -69,6 +69,11 @@ in stdenv.mkDerivation rec {
    paxmark m bin/{lli,llvm-rtdyld}
  '';

+  postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+    install_name_tool -id $out/lib/libLLVM.dylib $out/lib/libLLVM.dylib
+    ln -s $out/lib/libLLVM.dylib $out/lib/libLLVM-${version}.dylib
+  '';
+
  enableParallelBuilding = true;

  passthru.src = src;