Merge #174282: stdenv: switch default from gcc10 to gcc11

...into staging-next
2022-09-10 22:10:45 +02:00
parent cf964b46ea 00a0eeb2cb
commit 48979026bb
1 changed files with 2 additions and 4 deletions
@@ -13300,10 +13300,8 @@ with pkgs;
  inherit (let
      num =
        if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6
-        else if (stdenv.targetPlatform.isAarch64 && stdenv.isDarwin) then 11
-        else if (stdenv.targetPlatform.isx86_64 || stdenv.targetPlatform.isRiscV) then 11
-        else if stdenv.targetPlatform.isAarch64 then 9
-        else 10;
+        else if (stdenv.targetPlatform.isAarch64 && stdenv.isLinux) then 9
+        else 11;
      numS = toString num;
    in {
      gcc = pkgs.${"gcc${numS}"};