diff options
author | Dan Peebles <pumpkin@me.com> | 2017-03-21 23:22:15 -0400 |
---|---|---|
committer | Dan Peebles <pumpkin@me.com> | 2017-03-21 23:22:15 -0400 |
commit | 3263d02626cadc95a2ddc4e949128d4925c77b02 (patch) | |
tree | b44ca5822d2d09104664293504ee40751d39a8d6 /pkgs/development/compilers/llvm | |
parent | 5561abd5569e67f04479fe767bcea5038b3618ec (diff) | |
download | nixlib-3263d02626cadc95a2ddc4e949128d4925c77b02.tar nixlib-3263d02626cadc95a2ddc4e949128d4925c77b02.tar.gz nixlib-3263d02626cadc95a2ddc4e949128d4925c77b02.tar.bz2 nixlib-3263d02626cadc95a2ddc4e949128d4925c77b02.tar.lz nixlib-3263d02626cadc95a2ddc4e949128d4925c77b02.tar.xz nixlib-3263d02626cadc95a2ddc4e949128d4925c77b02.tar.zst nixlib-3263d02626cadc95a2ddc4e949128d4925c77b02.zip |
xcbuild: assorted fixes and cleanups
This is in preparation for the LLVM 4 upgrade (which gets more strict about e.g., return false in xcbuild itself) and also for using xcbuild more extensively in the Darwin stdenv bootstrap process, which is why I killed the unnecessary gcc dependency in the toolchain. llvm-cov pretends to be gcov anyway, so we're fine.
Diffstat (limited to 'pkgs/development/compilers/llvm')
4 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix index 535dbbc93d51..f27e3f0089e2 100644 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix @@ -42,6 +42,7 @@ let passthru = { lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; + inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 41e515249eb3..90b8ea2581e8 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -53,6 +53,7 @@ let passthru = { lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; + inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index 677c4a526ea4..b3616a0e86b6 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -42,6 +42,7 @@ let passthru = { lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; + inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 6ce63209935c..c93871592830 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -53,6 +53,7 @@ let passthru = { lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; + inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; |