From d01533ceabdd84674a90691969bf4294e9d97ce1 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 25 Aug 2021 21:05:28 +0200 Subject: [PATCH] pkgsCross.avr.buildPackages.gcc{10,11}: avoid log limit on hydra When upgrading from gcc 9 to 10, avr-gcc started to hit the hydra log limit, preventing the binary cache from being populated. This commit tries to workaround this issue by passing `-s` to make for avr-gcc 10 and 11 which seem to exhibit this problem. Reference #135605. --- pkgs/development/compilers/gcc/10/default.nix | 1 + pkgs/development/compilers/gcc/11/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 58a4dfbe36e1..a1598d3d3f07 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -147,6 +147,7 @@ stdenv.mkDerivation ({ else "") + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( + '-s' # workaround for hitting hydra log limit 'LIMITS_H_TEST=false' ) ''; diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 15d935618712..7b7f542de0cf 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -152,6 +152,7 @@ stdenv.mkDerivation ({ else "") + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( + '-s' # workaround for hitting hydra log limit 'LIMITS_H_TEST=false' ) '';