public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ccache: fix references to stdenv.cc.cc.isClang

Browse Source 
afa64a60bc73a5b5b1340f9ec9daae198d49e5d2 breaks the
tarball job https://hydra.nixos.org/build/40817224/nixlog/1/raw

The problem is that there is a stdenv.cc.cc.isGNU but no corresponding
stdenv.cc.cc.isClang. The "correct" fix would be to add
stdenv.cc.cc.isClang but this is simpler.
This commit is contained in:
Joachim Fasting 2016-09-18 15:34:27 +02:00
parent e2659de1b2
commit 634824d50b
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/misc/ccache/default.nix
View File

@ -19,15 +19,16 @@ let ccache = stdenv.mkDerivation rec {
passthru = let passthru = let
cc = stdenv.cc.cc; cc = stdenv.cc.cc;
ccname = if stdenv.cc.cc.isClang or false then "clang" else "gcc"; ccname = if stdenv.cc.isClang then "clang" else "gcc";
cxxname = if stdenv.cc.cc.isClang or false then "clang++" else "g++"; cxxname = if stdenv.cc.isClang then "clang++" else "g++";
in { in {
# A derivation that provides gcc and g++ commands, but that # A derivation that provides gcc and g++ commands, but that
# will end up calling ccache for the given cacheDir # will end up calling ccache for the given cacheDir
links = extraConfig: stdenv.mkDerivation rec { links = extraConfig: stdenv.mkDerivation rec {
name = "ccache-links"; name = "ccache-links";
passthru = { passthru = {
inherit (cc) isGNU isClang; inherit (stdenv.cc) isClang;
inherit (cc) isGNU;
}; };
inherit (cc) lib; inherit (cc) lib;
buildCommand = '' buildCommand = ''