summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Granberg <zorry@gentoo.org>2014-08-04 23:03:28 +0000
committerMagnus Granberg <zorry@gentoo.org>2014-08-04 23:03:28 +0000
commit31e513fb1acee776ef45343783ec828b71bca098 (patch)
treea8bc3bf95e95cd908b9418481a1490a8fc8b5fe8 /eclass/toolchain.eclass
parentPegasos hardware is no longer supported. Use just arch/powerpc/ppc32. (diff)
downloadgentoo-2-31e513fb1acee776ef45343783ec828b71bca098.tar.gz
gentoo-2-31e513fb1acee776ef45343783ec828b71bca098.tar.bz2
gentoo-2-31e513fb1acee776ef45343783ec828b71bca098.zip
Fix bug #513706 ssp only on gnu CTARGET's
Diffstat (limited to 'eclass/toolchain.eclass')
-rw-r--r--eclass/toolchain.eclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 4f48202d62ee..011bffeb23dd 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.632 2014/06/01 23:00:45 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.633 2014/08/04 23:03:28 zorry Exp $
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1133,7 +1133,9 @@ toolchain_src_configure() {
if use_if_iuse libssp ; then
confgcc+=( --enable-libssp )
else
- export gcc_cv_libc_provides_ssp=yes
+ if hardened_gcc_is_stable ssp: then
+ export gcc_cv_libc_provides_ssp=yes
+ fi
confgcc+=( --disable-libssp )
fi
@@ -2161,7 +2163,7 @@ hardened_gcc_is_stable() {
elif [[ $1 == "ssp" ]] ; then
if [[ ${CTARGET} == *-uclibc* ]] ; then
tocheck=${SSP_UCLIBC_STABLE}
- else
+ elfi [[ ${CTARGET} == *-gnu* ]] ; then
tocheck=${SSP_STABLE}
fi
else