Unverified Commit 99a95083 authored by Kira Bruneau's avatar Kira Bruneau Committed by GitHub
Browse files

Merge pull request #178280 from veprbl/pr/ccache_clang_fix 

cc-wrapper: disable response files for ccache
parents cce076bd daa77caf

pkgs/build-support/cc-wrapper/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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"

      }

pkgs/development/tools/misc/ccache/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { 
      passthru = {

        isClang = unwrappedCC.isClang or false;

        isGNU = unwrappedCC.isGNU or false;

        isCcache = true;

      };

      inherit (unwrappedCC) lib;

      nativeBuildInputs = [ makeWrapper ];