diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-09-15 11:04:14 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-19 17:52:32 +0200 |
| commit | 16cf4489336fcfddc3b335a499a958e0fd8277e7 (patch) | |
| tree | 5c11275fc6c419f5266e6da8671bbf958c891e25 /pkgs | |
| parent | 52d1f68005bcec196f4d7f7b419b119bdfdf7c03 (diff) | |
| download | nixpkgs-16cf4489336fcfddc3b335a499a958e0fd8277e7.tar nixpkgs-16cf4489336fcfddc3b335a499a958e0fd8277e7.tar.gz nixpkgs-16cf4489336fcfddc3b335a499a958e0fd8277e7.tar.bz2 nixpkgs-16cf4489336fcfddc3b335a499a958e0fd8277e7.tar.lz nixpkgs-16cf4489336fcfddc3b335a499a958e0fd8277e7.tar.xz nixpkgs-16cf4489336fcfddc3b335a499a958e0fd8277e7.tar.zst nixpkgs-16cf4489336fcfddc3b335a499a958e0fd8277e7.zip | |
gettext, gcc5: enable stackprotector now
This has been forgotten in #29349 ?
Diffstat (limited to 'pkgs')
| -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 f593e00ccfd..7ddc52592ff 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 ee74836df81..a35d2380ede 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 ""; |