diff options
| author | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-20 15:38:33 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-20 15:38:33 +0200 |
| commit | e071dab266dcee87c90605407d5c8ccf3e030d64 (patch) | |
| tree | ff3bd97c415027d35111c4cbf722acbb0df745ba /pkgs/development/compilers | |
| parent | d12e9c1a30cf9c2996a14a2b2c4775971e394430 (diff) | |
| parent | 43427da31e6f653a2ac48c76216447b118a8f1b4 (diff) | |
Merge pull request #15252 from acowley/llvm_38
llvm_38: update hashes and fix on darwin
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.8/libc++/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.8/libc++abi.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.8/llvm.nix | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index 00bfb3518b10..e4da582857a1 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "0i7iyzk024krda5spfpfi8jksh83yp3bxqkal0xp76ffi11bszrm"; + src = fetch "libcxx" "0yr3fh8vj38289b9cwk37zsy7x98dcd3kjy7xxy8mg20p48lb01n"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index ec0be51a11cf..fdbc002688e9 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4"; + src = fetch "libcxxabi" "0175rv2ynkklbg96kpw13iwhnzyrlw3r12f4h09p9v7nmxqhivn5"; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index db73999719da..f586fd0c7528 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -35,6 +35,13 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses zlib ]; + # hacky fix: New LLVM releases require a newer OS X SDK than + # 10.9. This is a temporary measure until nixpkgs darwin support is + # updated. + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ |