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

1 files changed, 0 insertions, 20 deletions

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 4f092ee1d97c..836dedf1cb18 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -236,26 +236,6 @@ rec {
       });
     };
 
-  useHardenFlags = stdenv: stdenv //
-    { mkDerivation = args: stdenv.mkDerivation (args // {
-        NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "")
-          + stdenv.lib.optionalString (args.hardening_all or true) (
-            stdenv.lib.optionalString (args.hardening_fortify or true) " -O2 -D_FORTIFY_SOURCE=2"
-            + stdenv.lib.optionalString (args.hardening_stackprotector or true) " -fstack-protector-strong"
-            + stdenv.lib.optionalString (args.hardening_pie or false) " -fPIE -pie"
-            + stdenv.lib.optionalString (args.hardening_pic or true) " -fPIC"
-            + stdenv.lib.optionalString (args.hardening_strictoverflow or true) " -fno-strict-overflow"
-            + stdenv.lib.optionalString (args.hardening_format or true) " -Wformat -Wformat-security -Werror=format-security"
-          );
-        NIX_LDFLAGS = toString (args.NIX_LDFLAGS or "")
-          + stdenv.lib.optionalString (args.hardening_all or true) (
-              stdenv.lib.optionalString (args.hardening_relro or true) " -z relro"
-            + stdenv.lib.optionalString (args.hardening_bindnow or true) " -z now"
-          );
-
-      });
-    };
-
   dropCxx = drv: drv.override {
     stdenv = if pkgs.stdenv.isDarwin
       then pkgs.allStdenvs.stdenvDarwinNaked