public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "libgcc: use glibc major and minor version but not the patch level"

Browse Source 
The fix is no longer required with the restored passthru version.

This reverts commit 6020fe250894e3589d517767d7691fe34f5f5a52.
This commit is contained in:
Andreas Rammhold 2021-05-18 20:23:04 +02:00 committed by Jonathan Ringer
parent a459e51174
commit abbbeaf42a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/gcc/libgcc/default.nix
View File

@ -129,8 +129,7 @@ stdenvNoLibs.mkDerivation rec {
"--with-system-zlib" "--with-system-zlib"
] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") ] ++ 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=${glibc.version}";
"--with-glibc-version=${builtins.head (builtins.split "-" glibc.version)}";
configurePlatforms = [ "build" "host" ]; configurePlatforms = [ "build" "host" ];
configureFlags = [ configureFlags = [