From 9acca21fb54894ae2975d0bf2f8054f36853c877 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 20 Sep 2024 02:51:28 +0300 Subject: [PATCH] default-gcc-version: Remove conditional for vc4 and relibc `gcc6` was removed in a42d18b4e601cfa6ca76a34adb369a40e4a7f10c `relibc` was removed in e6f33f4a94e0ebe6f0624af51af190beee64f2a9 `pkgsCross.vc4.stdenv.cc` is broken in the patching of binutils --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b34c48afbf6..e6f858acb1dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14853,9 +14853,7 @@ with pkgs; gbforth = callPackage ../development/compilers/gbforth { }; - default-gcc-version = - if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6 - else 14; + default-gcc-version = 14; gcc = pkgs.${"gcc${toString default-gcc-version}"}; gccFun = callPackage ../development/compilers/gcc; gcc-unwrapped = gcc.cc;