From cd017591272cb125b3fe7cbc66f9ee18eeeb8092 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Sun, 8 Mar 2015 19:54:32 +0100 Subject: [PATCH] defaults.conf: move -z now to hardened-ld only. --- common/environment/configure/gccspecs/hardened-ld | 2 +- etc/defaults.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/environment/configure/gccspecs/hardened-ld b/common/environment/configure/gccspecs/hardened-ld index fdfa18574a4..36b31d73f92 100644 --- a/common/environment/configure/gccspecs/hardened-ld +++ b/common/environment/configure/gccspecs/hardened-ld @@ -2,4 +2,4 @@ + %{static|Bstatic|shared|Bshareable|i|r|pie|nopie:;:-pie} *link: -+ %{!static:-z relro} ++ %{!static:-z relro -z now} diff --git a/etc/defaults.conf b/etc/defaults.conf index 12d6451e160..d6f2f477a63 100644 --- a/etc/defaults.conf +++ b/etc/defaults.conf @@ -33,7 +33,7 @@ XBPS_CPPFLAGS="-D_FORTIFY_SOURCE=2" # avoid linking extra libraries into binaries. See the following link # for info: http://www.gentoo.org/proj/en/qa/asneeded.xml # -XBPS_LDFLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" +XBPS_LDFLAGS="-Wl,--as-needed -Wl,-z,relro" # [REQUIRED] # Command to execute to gain root privileges when using the `update-sys`