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

glibc: remove TODO that is now done 

This was preventing a mass-rebuild by returning null. As of
5f2d96ba2e it always returns a string.
This commit is contained in:
Andrew Childs 2020-01-06 23:31:55 +09:00
parent 99470a3cb5
commit 569f05222c
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,20 +49,12 @@ callPackage ./common.nix { inherit stdenv; } {
++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie"; ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie";
NIX_CFLAGS_COMPILE = stdenv.lib.concatStringsSep " " NIX_CFLAGS_COMPILE = stdenv.lib.concatStringsSep " "
(if !stdenv.hostPlatform.isMusl (builtins.concatLists [
# TODO: This (returning a string or `null`, instead of a list) is to (stdenv.lib.optionals withGd gdCflags)
# not trigger a mass rebuild due to the introduction of the # Fix -Werror build failure when building glibc with musl with GCC >= 8, see:
# musl-specific flags below. # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798
# At next change to non-musl glibc builds, remove this `then` (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias")
# and the above condition, instead keeping only the `else` below. ]);
then (stdenv.lib.optionals withGd gdCflags)
else
(builtins.concatLists [
(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")
]));
# 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