Merge pull request #178280 from veprbl/pr/ccache_clang_fix

cc-wrapper: disable response files for ccache

Changed files
+3 -2
pkgs
build-support
cc-wrapper
development
tools
misc
ccache
+2 -2
pkgs/build-support/cc-wrapper/default.nix
···
, 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
, grossHackForStagingNext ? false
···
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"
}
+1
pkgs/development/tools/misc/ccache/default.nix
···
passthru = {
isClang = unwrappedCC.isClang or false;
isGNU = unwrappedCC.isGNU or false;
+
isCcache = true;
};
inherit (unwrappedCC) lib;
nativeBuildInputs = [ makeWrapper ];