From abbbeaf42a9c9b0b8a0bef376dfe77b05f5c9ad2 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 18 May 2021 20:23:04 +0200 Subject: [PATCH] Revert "libgcc: use glibc major and minor version but not the patch level" The fix is no longer required with the restored passthru version. This reverts commit 6020fe250894e3589d517767d7691fe34f5f5a52. --- pkgs/development/libraries/gcc/libgcc/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index f658106802b..ab62fdf3fa2 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -129,8 +129,7 @@ stdenvNoLibs.mkDerivation rec { "--with-system-zlib" ] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") - # libgcc expects a glibc version of the format X.Y while we usually have a version X.Y-Z where Z is our patchlevel. - "--with-glibc-version=${builtins.head (builtins.split "-" glibc.version)}"; + "--with-glibc-version=${glibc.version}"; configurePlatforms = [ "build" "host" ]; configureFlags = [