diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-10-31 01:10:49 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-10-31 01:10:49 +0000 |
| commit | b423a74e1edb66ecb08c3e24506fdd1ffda353ac (patch) | |
| tree | c187a2fe72345ad05c167c755c4225cd3eafcb33 /eclass | |
| parent | Fixed compilation with latest zlib (diff) | |
| download | gentoo-2-b423a74e1edb66ecb08c3e24506fdd1ffda353ac.tar.gz gentoo-2-b423a74e1edb66ecb08c3e24506fdd1ffda353ac.tar.bz2 gentoo-2-b423a74e1edb66ecb08c3e24506fdd1ffda353ac.zip | |
further simplify IUSE/nossp updating
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 5d1686ff26ce..0c55bebfef5f 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.475 2011/10/26 23:27:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.476 2011/10/31 01:10:49 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -86,9 +86,9 @@ IUSE="build multislot nls nptl test vanilla" if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then IUSE+=" altivec fortran nocxx" [[ -n ${PIE_VER} ]] && IUSE+=" nopie" - [[ -n ${PP_VER} ]] && IUSE+=" nossp" [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking" - [[ -n ${D_VER} ]] && IUSE+=" d" + [[ -n ${D_VER} ]] && IUSE+=" d" + [[ -n ${PP_VER}${SPECS_VER} ]] && IUSE+=" nossp" if tc_version_is_at_least 3 ; then IUSE+=" bootstrap doc gcj gtk hardened libffi multilib objc" @@ -97,10 +97,7 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then tc_version_is_at_least "4.1" && IUSE+=" objc++" tc_version_is_at_least "4.2" && IUSE+=" openmp" tc_version_is_at_least "4.3" && IUSE+=" fixed-point" - if tc_version_is_at_least "4.4" ; then - IUSE+=" graphite" - [[ -n ${SPECS_VER} ]] && IUSE+=" nossp" - fi + tc_version_is_at_least "4.4" && IUSE+=" graphite" [[ ${GCC_BRANCH_VER} == 4.5 ]] && IUSE+=" lto" tc_version_is_at_least "4.6" && IUSE+=" go" fi |