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

glibc_memusage: fix build with gcc9

Browse Source
This commit is contained in:
Franz Pletz 2019-11-03 13:32:45 +01:00
parent 2e83bd66f6
commit 4f411338d7
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/glibc/default.nix
View File

@ -5,6 +5,14 @@
, buildPackages
}:
let
gdCflags = [
"-Wno-error=stringop-truncation"
"-Wno-error=missing-attributes"
"-Wno-error=array-bounds"
];
in
callPackage ./common.nix { inherit stdenv; } {
name = "glibc" + stdenv.lib.optionalString withGd "-gd";
@ -47,10 +55,10 @@ callPackage ./common.nix { inherit stdenv; } {
# musl-specific flags below.
# At next change to non-musl glibc builds, remove this `then`
# and the above condition, instead keeping only the `else` below.
then (if withGd then "-Wno-error=stringop-truncation" else null)
then (if withGd then gdCflags else null)
else
builtins.concatLists [
(stdenv.lib.optional withGd "-Wno-error=stringop-truncation")
(stdenv.lib.optionals withGd gdCflags)
# Fix -Werror build failure when building glibc with musl with GCC >= 8, see:
# https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798
(stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias")