diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-18 10:32:12 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-18 10:32:12 +0100 |
commit | 63c6875f26635923050ccac4fff8318ff5ac75da (patch) | |
tree | 32af0d0da4ce49cc9ae52efdb14a23904561f1e2 /pkgs/development/libraries/glibc | |
parent | 327ecf882af448b45473c34bc24465415a6c67fc (diff) | |
parent | d208fa53ebb3bc04afaf1feb48abfcbb3cff5492 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/glibc')
-rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 11 |
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 |