Skip to content

Commit

Permalink
cc-wrapper: disable response files for ccache
Browse files Browse the repository at this point in the history
The problem is that the ccache wrapper does not work with response
files (it seems like the fd doesn't survive after exec in the
makeWrapper wrapper).
  • Loading branch information
veprbl committed Jun 19, 2022
1 parent dd38503 commit daa77ca
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkgs/build-support/cc-wrapper/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
, propagateDoc ? cc != null && cc ? man
, extraTools ? [], extraPackages ? [], extraBuildCommands ? ""
, nixSupport ? {}
, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
, isGNU ? false, isClang ? cc.isClang or false, isCcache ? cc.isCcache or false, gnugrep ? null
, buildPackages ? {}
, libcxx ? null
}:
Expand Down Expand Up @@ -178,7 +178,7 @@ stdenv.mkDerivation {
local dst="$1"
local wrapper="$2"
export prog="$3"
export use_response_file_by_default=${if isClang then "1" else "0"}
export use_response_file_by_default=${if isClang && !isCcache then "1" else "0"}
substituteAll "$wrapper" "$out/bin/$dst"
chmod +x "$out/bin/$dst"
}
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/tools/misc/ccache/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ let ccache = stdenv.mkDerivation rec {
passthru = {
isClang = unwrappedCC.isClang or false;
isGNU = unwrappedCC.isGNU or false;
isCcache = true;
};
inherit (unwrappedCC) lib;
nativeBuildInputs = [ makeWrapper ];
Expand Down

0 comments on commit daa77ca

Please sign in to comment.