diff options
| author | Kira Bruneau <kira.bruneau@pm.me> | 2023-04-15 06:47:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-15 06:47:01 -0400 |
| commit | 99a95083df692858d19df73075fe57407d5dff05 (patch) | |
| tree | acd5ea54dd18b4b23330175820fd1e2c17825373 /pkgs/build-support | |
| parent | cce076bd2437e95c06d3b56f4fa174a2e3c0fcbf (diff) | |
| parent | daa77caf9bf660c52858772d8aa4cf9ab08ffe92 (diff) | |
Merge pull request #178280 from veprbl/pr/ccache_clang_fix
cc-wrapper: disable response files for ccache
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 19a5afee1fb83..e0ee3dae41fb4 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -14,7 +14,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 , grossHackForStagingNext ? false @@ -208,7 +208,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" } |