From e55bae788253ebd7c0b068046553dfb91ed3af25 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 13 Sep 2024 21:01:24 +0100 Subject: [PATCH] =?UTF-8?q?gcc{7,8}:=20use=20`gcc9Stdenv`=20for=20cross?= =?UTF-8?q?=E2=80=90compilation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No reason to use `gcc7Stdenv` here that I can see. --- pkgs/development/compilers/gcc/all.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix index 05adfbfb82c4..232241989b9a 100644 --- a/pkgs/development/compilers/gcc/all.nix +++ b/pkgs/development/compilers/gcc/all.nix @@ -1,7 +1,7 @@ { lib , stdenv , gccStdenv -, gcc7Stdenv +, gcc9Stdenv , callPackage , isl_0_17, isl_0_20 , libcCross @@ -29,7 +29,7 @@ let else /* atLeast "7" */ isl_0_17; } // lib.optionalAttrs (!(atLeast "9")) { # gcc 10 is too strict to cross compile gcc <= 8 - stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc9Stdenv else stdenv; }))); in lib.nameValuePair attrName pkg;