diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-03-18 02:28:51 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-03-18 02:28:51 +0000 |
| commit | 666f892a15330a96b182b2b31eebb0c1b44538fb (patch) | |
| tree | 8e2c69beded5bc99488de31e663eca4b8f1d5b14 | |
| parent | touchups (diff) | |
| download | historical-666f892a15330a96b182b2b31eebb0c1b44538fb.tar.gz historical-666f892a15330a96b182b2b31eebb0c1b44538fb.tar.bz2 historical-666f892a15330a96b182b2b31eebb0c1b44538fb.zip | |
make sure the hardened checks return 1 when the _VER variable is empty
| -rw-r--r-- | eclass/toolchain.eclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 85cbe802a674..20fd8e88e30d 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.128 2005/03/16 16:26:07 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.129 2005/03/18 02:28:51 vapier Exp $ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" LICENSE="GPL-2 LGPL-2.1" @@ -299,6 +299,7 @@ SRC_URI=$(get_gcc_src_uri) # 3) SSP by default hardened_gcc_works() { if [[ $1 == "pie" ]] ; then + [[ -z ${PIE_VER} ]] && return 1 hardened_gcc_is_stable pie && return 0 if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then hardened_gcc_check_unsupported pie && return 1 @@ -307,6 +308,7 @@ hardened_gcc_works() { fi return 1 elif [[ $1 == "ssp" ]] ; then + [[ -z ${PP_VER} ]] && return 1 hardened_gcc_is_stable ssp && return 0 if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then hardened_gcc_check_unsupported ssp && return 1 |