diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2020-01-06 23:31:55 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2020-01-12 03:28:33 +0900 |
| commit | 569f05222c667e5d077149515e3d8c423a741900 (patch) | |
| tree | 05a534278857d75e357168e93bda21d964b5fe49 /pkgs/development/libraries/glibc | |
| parent | 99470a3cb59abd2b1c3d6238b0c5bc6d5edcfc72 (diff) | |
glibc: remove TODO that is now done
This was preventing a mass-rebuild by returning null. As of
5f2d96ba2e8324fa4488fc689f324dbbb25be486 it always returns a string.
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 1a17595a1a32..b2afc66acc6a 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -49,20 +49,12 @@ callPackage ./common.nix { inherit stdenv; } { ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie"; NIX_CFLAGS_COMPILE = stdenv.lib.concatStringsSep " " - (if !stdenv.hostPlatform.isMusl - # TODO: This (returning a string or `null`, instead of a list) is to - # not trigger a mass rebuild due to the introduction of the - # 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 (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") - ])); + (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 # any program we run, because the gcc will have been placed at a new |