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

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

Browse Source 
libgcc requires the version scheme X.Y whilst our glibc version
attribute usually is X.Y-Z where Z is our patchlevel.
This commit is contained in:
Andreas Rammhold 2021-05-17 00:38:59 +02:00 committed by Jonathan Ringer
parent 20acd4c4f1
commit 6020fe2508
1 changed files with 2 additions and 1 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,7 +129,8 @@ stdenvNoLibs.mkDerivation rec {
"--with-system-zlib" "--with-system-zlib"
] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") ] ++ 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" ]; configurePlatforms = [ "build" "host" ];
configureFlags = [ configureFlags = [