From 720dc7c27d9731618f100ee84af75cfc43fc2225 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 6 May 2023 07:35:07 +0100 Subject: [PATCH] libgcc: 11.3.0 -> 12.2.0 Disable gcov to fix the build. --- pkgs/development/libraries/gcc/libgcc/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index 094bb7e7a1d3..835956055448 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -78,8 +78,7 @@ stdenvNoLibs.mkDerivation rec { tm.h \ options.h \ insn-constants.h \ - insn-modes.h \ - gcov-iov.h + insn-modes.h ) mkdir -p "$buildRoot/gcc/include" '' @@ -141,6 +140,9 @@ stdenvNoLibs.mkDerivation rec { # Do not have dynamic linker without libc "--enable-static" "--disable-shared" + + # Avoid dependency on gcc. + "--disable-gcov" ]; makeFlags = [ "MULTIBUILDTOP:=../" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82ecbc9e124c..bde6c0eafabe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17999,7 +17999,6 @@ with pkgs; libgcc = callPackage ../development/libraries/gcc/libgcc { stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems - gcc = gcc11; # fails to build with gcc12 }; # This is for e.g. LLVM libraries on linux.