summary refs log tree commit diff
path: root/pkgs/development/libraries/zlib
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-02-26 18:38:15 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2016-03-05 18:55:26 +0100
commitaff1f4ab948b921ceaf2b81610f2f82454302b4b (patch)
tree6e51e90a41409d56cfa084b9ca64921f2611fafc /pkgs/development/libraries/zlib
parenta2e449e43e82e258b94c723d92a5e9af641967e7 (diff)
Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
Diffstat (limited to 'pkgs/development/libraries/zlib')
-rw-r--r--pkgs/development/libraries/zlib/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 2871985a08269..77ab0f8ffa9ca 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (rec {
   '';
 
   # FIXME needs gcc 4.9 in bootstrap tools
-    hardening_stackprotector = false;
+  hardeningDisable = [ "stackprotector" ];
 
   # As zlib takes part in the stdenv building, we don't want references
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)