diff options
| author | Will Dietz <w@wdtz.org> | 2017-02-18 17:30:08 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2017-02-20 09:26:06 -0600 |
| commit | 2ebb086df167d7881b82af9585c65d43c440ff86 (patch) | |
| tree | 54860489e2adfba7c79ffe9d0084fc339d5c7761 /pkgs/development/compilers/llvm | |
| parent | 9d8ad57abc5462edb246bc6a27f38cc7cf777a02 (diff) | |
| download | nixlib-2ebb086df167d7881b82af9585c65d43c440ff86.tar nixlib-2ebb086df167d7881b82af9585c65d43c440ff86.tar.gz nixlib-2ebb086df167d7881b82af9585c65d43c440ff86.tar.bz2 nixlib-2ebb086df167d7881b82af9585c65d43c440ff86.tar.lz nixlib-2ebb086df167d7881b82af9585c65d43c440ff86.tar.xz nixlib-2ebb086df167d7881b82af9585c65d43c440ff86.tar.zst nixlib-2ebb086df167d7881b82af9585c65d43c440ff86.zip | |
llvm-4.0/libc++abi: Remove LLVM build dep to unbreak Darwin evaluation.
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/4.0/libc++abi.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/4.0/libc++abi.nix b/pkgs/development/compilers/llvm/4.0/libc++abi.nix index 52da7cc1988e..362663ed443f 100644 --- a/pkgs/development/compilers/llvm/4.0/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4.0/libc++abi.nix @@ -5,11 +5,12 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "09hlqlbxpnqi3449nrk43khp4jgd34xwx406mw6igwl8a673pa85"; - buildInputs = [ cmake llvm ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; postUnpack = '' unpackFile ${libcxx.src} - export cmakeFlags="-DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" + unpackFile ${llvm.src} + export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" '' + stdenv.lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin ''; |