summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2017-06-14 17:00:32 +0200
committerMatthias Maier <tamiko@gentoo.org>2017-06-16 03:23:34 -0500
commit28ec20d517e494deed48497b1c478f5bd4dff1a6 (patch)
tree974c741c1b730ad32a0954dcae09a41db035e54c
parenttoolchain-glibc.eclass: Build most of >=sys-libs/glibc-2.25 with -fstack-prot... (diff)
downloadgentoo-28ec20d517e494deed48497b1c478f5bd4dff1a6.tar.gz
gentoo-28ec20d517e494deed48497b1c478f5bd4dff1a6.tar.bz2
gentoo-28ec20d517e494deed48497b1c478f5bd4dff1a6.zip
toolchain-glibc.eclass: Always enable stack guard randomization (bug #621742).
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
-rw-r--r--eclass/toolchain-glibc.eclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index eba829cd2f62..d1e79975ccff 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -780,7 +780,6 @@ glibc_do_configure() {
[[ -d ports ]] && addons+=",ports"
popd > /dev/null
- myconf+=( $(use_enable hardened stackguard-randomization) )
if has_version '<sys-libs/glibc-2.13' ; then
myconf+=( --enable-old-ssp-compat )
fi
@@ -789,6 +788,12 @@ glibc_do_configure() {
myconf+=( --enable-stack-protector=all )
fi
+ if version_is_at_least 2.25 ; then
+ myconf+=( --enable-stackguard-randomization )
+ else
+ myconf+=( $(use_enable hardened stackguard-randomization) )
+ fi
+
[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
if [[ $1 == "linuxthreads" ]] ; then