diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-12-06 04:52:25 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-12-06 04:52:25 +0000 |
| commit | 755081245935a7161975eb1b1e11bd9067cd06e3 (patch) | |
| tree | 2d864a54bdf3df1faf43b6eef10a597d1ab0a540 | |
| parent | drop {PIE,SSP}_UNSUPPORTED variable checking since no one sets these, and it ... (diff) | |
| download | gentoo-2-755081245935a7161975eb1b1e11bd9067cd06e3.tar.gz gentoo-2-755081245935a7161975eb1b1e11bd9067cd06e3.tar.bz2 gentoo-2-755081245935a7161975eb1b1e11bd9067cd06e3.zip | |
drop HARDENED_{GCC,PIE}_WORKS variable checking since no one sets these anymore
| -rw-r--r-- | eclass/toolchain.eclass | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 6d85d9f290b9..9fdaef23d45c 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.496 2011/12/06 04:50:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.497 2011/12/06 04:52:25 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -348,7 +348,7 @@ hardened_gcc_works() { return $? elif [[ $1 == "ssp" ]] ; then [[ -n ${SPECS_VER} ]] || return 1 - use_if_iuse no$1 && return 1 + use_if_iuse nossp && return 1 hardened_gcc_is_stable ssp return $? else @@ -360,21 +360,18 @@ hardened_gcc_works() { } hardened_gcc_is_stable() { + local tocheck if [[ $1 == "pie" ]] ; then - # HARDENED_* variables are deprecated and here for compatibility - local tocheck="${HARDENED_PIE_WORKS} ${HARDENED_GCC_WORKS}" if [[ ${CTARGET} == *-uclibc* ]] ; then - tocheck="${tocheck} ${PIE_UCLIBC_STABLE}" + tocheck=${PIE_UCLIBC_STABLE} else - tocheck="${tocheck} ${PIE_GLIBC_STABLE}" + tocheck=${PIE_GLIBC_STABLE} fi elif [[ $1 == "ssp" ]] ; then - # ditto - local tocheck="${HARDENED_SSP_WORKS} ${HARDENED_GCC_WORKS}" if [[ ${CTARGET} == *-uclibc* ]] ; then - tocheck="${tocheck} ${SSP_UCLIBC_STABLE}" + tocheck=${SSP_UCLIBC_STABLE} else - tocheck="${tocheck} ${SSP_STABLE}" + tocheck=${SSP_STABLE} fi else die "hardened_gcc_stable needs to be called with pie or ssp" |