Merge #169212: glibc: unconditionally disable pie

...into staging
2022-04-23 17:09:32 +02:00
parent 06a022f786 bf990cc3cc
commit 1b3bb6cde3
1 changed files with 4 additions and 7 deletions
@@ -40,13 +40,10 @@ callPackage ./common.nix { inherit stdenv; } {
      makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
    '';

-    # The stackprotector and fortify hardening flags are autodetected by glibc
-    # and enabled by default if supported. Setting it for every gcc invocation
-    # does not work.
-    hardeningDisable = [ "stackprotector" "fortify" ]
-    # XXX: Not actually musl-speciic but since only musl enables pie by default,
-    #      limit rebuilds by only disabling pie w/musl
-      ++ lib.optional stdenv.hostPlatform.isMusl "pie";
+    # The pie, stackprotector and fortify hardening flags are autodetected by
+    # glibc and enabled by default if supported. Setting it for every gcc
+    # invocation does not work.
+    hardeningDisable = [ "fortify" "pie" "stackprotector" ];

    NIX_CFLAGS_COMPILE = lib.concatStringsSep " "
      (builtins.concatLists [