From 6020fe250894e3589d517767d7691fe34f5f5a52 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 17 May 2021 00:38:59 +0200 Subject: [PATCH] libgcc: use glibc major and minor version but not the patch level libgcc requires the version scheme X.Y whilst our glibc version attribute usually is X.Y-Z where Z is our patchlevel. --- pkgs/development/libraries/gcc/libgcc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index ab62fdf3fa20295..f658106802b4669 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -129,7 +129,8 @@ stdenvNoLibs.mkDerivation rec { "--with-system-zlib" ] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") - "--with-glibc-version=${glibc.version}"; + # 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)}"; configurePlatforms = [ "build" "host" ]; configureFlags = [