diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-05-24 05:08:11 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-24 05:08:11 +0000 |
| commit | 1dd1ba32b827afee9b23350025f52c9024df49e1 (patch) | |
| tree | f1b1f3f1b7ae0e7085ef8e25bfeef16ec569bfd0 /eclass | |
| parent | version bump (diff) | |
| download | gentoo-2-1dd1ba32b827afee9b23350025f52c9024df49e1.tar.gz gentoo-2-1dd1ba32b827afee9b23350025f52c9024df49e1.tar.bz2 gentoo-2-1dd1ba32b827afee9b23350025f52c9024df49e1.zip | |
make sure we can still exclude [ssp/pie] & boundschecking
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 24da26676ab7..a1a1724a9a14 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.152 2005/05/24 03:57:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.153 2005/05/24 05:08:11 vapier Exp $ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" LICENSE="GPL-2 LGPL-2.1" @@ -1652,7 +1652,7 @@ exclude_gcc_patches() { } do_gcc_HTB_boundschecking_patches() { - want_boundschecking || return 1 + want_boundschecking || return 0 # modify the bounds checking patch with a regression patch epatch "${WORKDIR}/bounds-checking-${PN}-${HTB_GCC_VER}-${HTB_VER}.patch" release_version="${release_version}, HTB-${HTB_GCC_VER}-${HTB_VER}" @@ -1663,6 +1663,8 @@ do_gcc_SSP_patches() { # PARISC has no love ... it's our stack :( [[ $(tc-arch) == "hppa" ]] && return 0 + want_boundschecking && [[ ${HTB_EXCLUSIVE} == "true" ]] && return 0 + local ssppatch local sspdocs @@ -1728,6 +1730,8 @@ update_gcc_for_libssp() { # do various updates to PIE logic do_gcc_PIE_patches() { + want_boundschecking && [[ ${HTB_EXCLUSIVE} == "true" ]] && return 0 + want_boundschecking \ && rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-no.patch.bz2 \ || rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-yes.patch.bz2 |