diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-13 21:01:29 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-13 21:02:04 -0400 |
| commit | e358fff0d668d825e6e9b8376466bf56e0422d7b (patch) | |
| tree | e92b842209e8af835c5ed5954e13ddf86b4c8b86 /pkgs/development/compilers/llvm | |
| parent | 20d16d92a6033ce084a8a7b47497d503fd405994 (diff) | |
| download | nixlib-e358fff0d668d825e6e9b8376466bf56e0422d7b.tar nixlib-e358fff0d668d825e6e9b8376466bf56e0422d7b.tar.gz nixlib-e358fff0d668d825e6e9b8376466bf56e0422d7b.tar.bz2 nixlib-e358fff0d668d825e6e9b8376466bf56e0422d7b.tar.lz nixlib-e358fff0d668d825e6e9b8376466bf56e0422d7b.tar.xz nixlib-e358fff0d668d825e6e9b8376466bf56e0422d7b.tar.zst nixlib-e358fff0d668d825e6e9b8376466bf56e0422d7b.zip | |
llvm: use native cmake for libc++abi
Finish what 1cb1b9193b64c74df3b269dabb520c9ae73ee8d5 started.
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.7/libc++abi.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.8/libc++abi.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.9/libc++abi.nix | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix index d2be57b1a5fa..2c79d7b3b1b5 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix @@ -11,7 +11,8 @@ in stdenv.mkDerivation { src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4"; - buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; postUnpack = '' unpackFile ${libcxx.src} diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index 6b98a5726cf6..45fb7b5be4f6 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1"; - buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; postUnpack = '' unpackFile ${libcxx.src} diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index 65345ca69925..dc508757ab6d 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -6,7 +6,6 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj"; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; postUnpack = '' |