diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-11-22 05:19:37 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-11-22 05:19:37 +0000 |
| commit | 548fdf47fce5fb856e2becea682bc2f6daf50a4a (patch) | |
| tree | 8a267e77443c9336d30aa4167a84934ff59a5e6a /eclass/toolchain.eclass | |
| parent | fix a prefix typo (diff) | |
| download | gentoo-2-548fdf47fce5fb856e2becea682bc2f6daf50a4a.tar.gz gentoo-2-548fdf47fce5fb856e2becea682bc2f6daf50a4a.tar.bz2 gentoo-2-548fdf47fce5fb856e2becea682bc2f6daf50a4a.zip | |
drop USE=nocxx support since everyone should be migrated now
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index c735b6ca4cc8..72805fae449f 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.555 2012/11/19 06:55:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.556 2012/11/22 05:19:37 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -100,7 +100,7 @@ STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VE IUSE="build multislot nls nptl test vanilla" if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then - IUSE+=" altivec cxx fortran nocxx" + IUSE+=" altivec cxx fortran" [[ -n ${PIE_VER} ]] && IUSE+=" nopie" [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking" [[ -n ${D_VER} ]] && IUSE+=" d" @@ -1022,15 +1022,6 @@ gcc-compiler-configure() { gcc_do_configure() { local confgcc - # Sanity check for USE=nocxx -> USE=cxx migration - if in_iuse cxx && in_iuse nocxx ; then - if (use cxx && use nocxx) || (use !cxx && use !nocxx) ; then - eerror "We are migrating USE=nocxx to USE=cxx, but your USE settings do not make" - eerror "sense. Please make sure these two flags line up logically in your setup." - die "USE='cxx nocxx' and USE='-cxx -nocxx' make no sense" - fi - fi - # Set configuration based on path variables confgcc+=" \ --prefix=${PREFIX} \ |