cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
afa64a60bc 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
cc = stdenv.cc.cc;
ccname = if stdenv.cc.cc.isClang or false then "clang" else "gcc";
cxxname = if stdenv.cc.cc.isClang or false then "clang++" else "g++";
ccname = if stdenv.cc.isClang then "clang" else "gcc";
cxxname = if stdenv.cc.isClang then "clang++" else "g++";
in {
# A derivation that provides gcc and g++ commands, but that
# will end up calling ccache for the given cacheDir
links = extraConfig: stdenv.mkDerivation rec {
name = "ccache-links";
passthru = {
inherit (cc) isGNU isClang;
inherit (stdenv.cc) isClang;
inherit (cc) isGNU;
};
inherit (cc) lib;
buildCommand = ''