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

glibc: NIX_CFLAGS_COMPILE -> always string

Browse Source
This commit is contained in:
Robin Gloster 2019-10-30 00:44:07 +01:00 committed by Jan Tojnar
parent a13649c6b1
commit 5f2d96ba2e
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,14 +47,14 @@ 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 (stdenv.lib.optionalString withGd "-Wno-error=stringop-truncation")
else else
builtins.concatLists [ builtins.toString (builtins.concatLists [
(stdenv.lib.optional withGd "-Wno-error=stringop-truncation") (stdenv.lib.optional withGd "-Wno-error=stringop-truncation")
# 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")
]; ]);
# When building glibc from bootstrap-tools, we need libgcc_s at RPATH for # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
# any program we run, because the gcc will have been placed at a new # any program we run, because the gcc will have been placed at a new