gettext, gcc5: enable stackprotector now

This has been forgotten in #29349 ?
7 years ago · 16cf448933
parent 52d1f68005
commit 16cf448933
2 changed files with 2 additions and 4 deletions
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@ -221,8 +221,7 @@ stdenv.mkDerivation ({
    inherit sha256;
  };

-  # FIXME stackprotector needs gcc 4.9 in bootstrap tools
-  hardeningDisable = [ "stackprotector" "format" ];
+  hardeningDisable = [ "format" ];

  inherit patches;

--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@ -12,8 +12,7 @@ stdenv.mkDerivation rec {

  outputs = [ "out" "man" "doc" "info" ];

-  # FIXME stackprotector needs gcc 4.9 in bootstrap tools
-  hardeningDisable = [ "format" "stackprotector" ];
+  hardeningDisable = [ "format" ];

  LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";