diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-04-15 12:02:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-15 12:02:10 +0000 |
| commit | a6e62de641a0ca330e0832bc4cc2624efb521450 (patch) | |
| tree | e03d239b133c1ba6bcf09f90796f1909a54782da /pkgs/build-support | |
| parent | 2f5fa4a6f739fa8ba6c8f4f63dbf5a64a07ac84e (diff) | |
| parent | 70b38b02ed7746f8f94725d6815674c45f4243cd (diff) | |
| download | nixpkgs-a6e62de641a0ca330e0832bc4cc2624efb521450.tar nixpkgs-a6e62de641a0ca330e0832bc4cc2624efb521450.tar.gz nixpkgs-a6e62de641a0ca330e0832bc4cc2624efb521450.tar.bz2 nixpkgs-a6e62de641a0ca330e0832bc4cc2624efb521450.tar.lz nixpkgs-a6e62de641a0ca330e0832bc4cc2624efb521450.tar.xz nixpkgs-a6e62de641a0ca330e0832bc4cc2624efb521450.tar.zst nixpkgs-a6e62de641a0ca330e0832bc4cc2624efb521450.zip | |
Merge staging-next into staging
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 3b6f395beed..897cd97f043 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 @@ -207,7 +207,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" } |