glibc_memusage: fix build with gcc9
This commit is contained in:
parent
2e83bd66f6
commit
4f411338d7
|
@ -5,6 +5,14 @@
|
||||||
, buildPackages
|
, buildPackages
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
gdCflags = [
|
||||||
|
"-Wno-error=stringop-truncation"
|
||||||
|
"-Wno-error=missing-attributes"
|
||||||
|
"-Wno-error=array-bounds"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
|
||||||
callPackage ./common.nix { inherit stdenv; } {
|
callPackage ./common.nix { inherit stdenv; } {
|
||||||
name = "glibc" + stdenv.lib.optionalString withGd "-gd";
|
name = "glibc" + stdenv.lib.optionalString withGd "-gd";
|
||||||
|
|
||||||
|
@ -47,10 +55,10 @@ callPackage ./common.nix { inherit stdenv; } {
|
||||||
# musl-specific flags below.
|
# musl-specific flags below.
|
||||||
# At next change to non-musl glibc builds, remove this `then`
|
# At next change to non-musl glibc builds, remove this `then`
|
||||||
# and the above condition, instead keeping only the `else` below.
|
# 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
|
else
|
||||||
builtins.concatLists [
|
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:
|
# Fix -Werror build failure when building glibc with musl with GCC >= 8, see:
|
||||||
# https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798
|
# https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798
|
||||||
(stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias")
|
(stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias")
|
||||||
|
|
Loading…
Reference in a new issue