diff options
-rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/gettext/default.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index f593e00ccfd4..7ddc52592ffd 100644 --- 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; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index ee74836df81d..a35d2380eded 100644 --- 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 ""; |