diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-14 10:22:33 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-14 19:22:15 -0400 |
commit | 6e7e22da70850e18d7949b95b215c011b9afda70 (patch) | |
tree | a3f196df67a891974613a40c4f064fd09e0fc2fb /pkgs/development/compilers/llvm/5/clang | |
parent | fc9644d4c9c9d29958e9bcf1676d48d4b3026bb4 (diff) | |
download | nixlib-6e7e22da70850e18d7949b95b215c011b9afda70.tar nixlib-6e7e22da70850e18d7949b95b215c011b9afda70.tar.gz nixlib-6e7e22da70850e18d7949b95b215c011b9afda70.tar.bz2 nixlib-6e7e22da70850e18d7949b95b215c011b9afda70.tar.lz nixlib-6e7e22da70850e18d7949b95b215c011b9afda70.tar.xz nixlib-6e7e22da70850e18d7949b95b215c011b9afda70.tar.zst nixlib-6e7e22da70850e18d7949b95b215c011b9afda70.zip |
llvm 5: split out compiler-rt and remove libcxxabi dep
We already did them on non-mass-rebuild llvm 6. Also, this allows simplifying the stdenv booting. We were missing the libcxxabi dep in compile-rt in llvm 6, so fixed that too.
Diffstat (limited to 'pkgs/development/compilers/llvm/5/clang')
-rw-r--r-- | pkgs/development/compilers/llvm/5/clang/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 8027733bc527..07738048f8e2 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -30,10 +30,7 @@ let "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] - # Maybe with compiler-rt this won't be needed? - ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; + ]; patches = [ ./purity.patch ]; @@ -50,13 +47,12 @@ let outputs = [ "out" "lib" "python" ]; + # Clang expects to find LLVMgold in its own prefix postInstall = '' - # Clang expects to find LLVMgold in its own prefix if [ -e ${llvm}/lib/LLVMgold.so ]; then ln -sv ${llvm}/lib/LLVMgold.so $out/lib fi - # Clang expects to find sanitizer libraries in its own prefix - ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ + ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output |