diff options
author | Eric Seidel <gridaphobe@gmail.com> | 2015-05-11 14:30:13 -0700 |
---|---|---|
committer | Eric Seidel <gridaphobe@gmail.com> | 2015-05-11 14:39:36 -0700 |
commit | 395829686d0219b3e14fe6ffae60a24b4e50370b (patch) | |
tree | d8ec773c31ba34feab780dd688b32cf9de0ce0f9 /pkgs/stdenv/darwin | |
parent | ea0c877858e071d2258680cb4779786ff1f0dea0 (diff) | |
download | nixlib-395829686d0219b3e14fe6ffae60a24b4e50370b.tar nixlib-395829686d0219b3e14fe6ffae60a24b4e50370b.tar.gz nixlib-395829686d0219b3e14fe6ffae60a24b4e50370b.tar.bz2 nixlib-395829686d0219b3e14fe6ffae60a24b4e50370b.tar.lz nixlib-395829686d0219b3e14fe6ffae60a24b4e50370b.tar.xz nixlib-395829686d0219b3e14fe6ffae60a24b4e50370b.tar.zst nixlib-395829686d0219b3e14fe6ffae60a24b4e50370b.zip |
add is{GNU,Clang} attrs to cc-wrapper.
These will be more pleasant to use than the existing (cc.cc.isClang or false) nonsense we currently do.
Diffstat (limited to 'pkgs/stdenv/darwin')
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f06170b5cb10..ac396ecdf12b 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -90,6 +90,7 @@ rec { cc = "/usr"; outPath = nativePrefix; }; + isClang = true; }; }; pkgs = allPackages { @@ -129,13 +130,14 @@ rec { cc = import ../../build-support/cc-wrapper { inherit stdenv; - nativeTools = false; - nativeLibc = true; - binutils = pkgs.darwin.cctools; - cc = pkgs.llvmPackages.clang-unwrapped; - coreutils = pkgs.coreutils; - shell = "${pkgs.bash}/bin/bash"; + nativeTools = false; + nativeLibc = true; + binutils = pkgs.darwin.cctools; + cc = pkgs.llvmPackages.clang-unwrapped; + coreutils = pkgs.coreutils; + shell = "${pkgs.bash}/bin/bash"; extraPackages = [ pkgs.libcxx ]; + isClang = true; }; shell = "${pkgs.bash}/bin/bash"; |