Merge master into staging-next

1 files changed, 10 insertions, 1 deletions

diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 8b17ff9e55850..27a1267f0cfe1 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -10,6 +10,12 @@ callPackage ./common.nix { inherit stdenv; } {
 
     inherit withLinuxHeaders profilingLibraries installLocales withGd;
 
+    # Note:
+    # Things you write here override, and do not add to,
+    # the values in `common.nix`.
+    # (For example, if you define `patches = [...]` here, it will
+    # override the patches in `common.nix`.)
+
     NIX_NO_SELF_RPATH = true;
 
     postConfigure = ''
@@ -29,7 +35,10 @@ callPackage ./common.nix { inherit stdenv; } {
     # 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" ];
+    hardeningDisable = [ "stackprotector" "fortify" ]
+    # XXX: Not actually musl-speciic but since only musl enables pie by default,
+    #      limit rebuilds by only disabling pie w/musl
+      ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie";
 
     # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
     # any program we run, because the gcc will have been placed at a new