diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-15 14:14:19 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-19 11:34:44 +0200 |
commit | b8b2ca71ab11e0a9c32f61675e9ba83977993fdd (patch) | |
tree | eb73294f59c3ba1dbf2f83846a1ca4b965a28185 /pkgs/top-level | |
parent | ec263c50caf472391aab4d9ade177a0d838048e0 (diff) |
ccache.links: make it a function of unwrappedCC
That way we can use a ccacheStdenv with e.g. a different CC: stdenv = overrideCC gcc8Stdenv (ccacheWrapper.override { unwrappedCC = gcc8Stdenv.cc.cc; }); (cherry picked from commit 594ca3f1cfd5b188c440e9460dfbfece14706009)
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de7ab2bf62fba..464112005f224 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8563,9 +8563,9 @@ in # }; # You can use a different directory, but whichever directory you choose # should be owned by user root, group nixbld with permissions 0770. - ccacheWrapper = makeOverridable ({ extraConfig ? "" }: - wrapCC (ccache.links extraConfig)) {}; - ccacheStdenv = lowPrio (overrideCC stdenv ccacheWrapper); + ccacheWrapper = makeOverridable ({ extraConfig ? "", unwrappedCC ? stdenv.cc.cc }: + wrapCC (ccache.links {inherit unwrappedCC extraConfig;})) {}; + ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper); cccc = callPackage ../development/tools/analysis/cccc { }; |