diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-10-05 03:32:36 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-10-05 03:32:36 +0000 |
| commit | a0d0ff081158987bb75ece1ceb13633eb6f41201 (patch) | |
| tree | fddbce337f90470048c1b0c94acdafa72896aa5d /eclass | |
| parent | DOOOOOOOOOOOOOOOOOOOOM 3 (diff) | |
| download | historical-a0d0ff081158987bb75ece1ceb13633eb6f41201.tar.gz historical-a0d0ff081158987bb75ece1ceb13633eb6f41201.tar.bz2 historical-a0d0ff081158987bb75ece1ceb13633eb6f41201.zip | |
revert the multilib-by-default changes, since this seems to be causing problems with hardened, and we havent yet completely figured out how to handle mips' three ABIs.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index d822e422d050..6f1c1da27c51 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.25 2004/10/04 15:09:39 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.26 2004/10/05 03:32:36 lv Exp $ # # This eclass should contain general toolchain-related functions that are # expected to not change, or change much. @@ -23,7 +23,7 @@ if [ "${ETYPE}" == "gcc-library" ] ; then fi fi else - IUSE="static nls bootstrap build nomultilib gcj gtk f77 objc hardened uclibc n32 n64" + IUSE="static nls bootstrap build multilib gcj gtk f77 objc hardened uclibc n32 n64" if [ "${CHOST}" == "${CCHOST}" ] ; then SLOT="${PV%.*}" else @@ -115,8 +115,8 @@ gcc-compiler-pkg_setup() { esac #cannot have both n32 & n64 without multilib - if use n32 && use n64 && use nomultilib; then - eerror "Please disable nomultilib if you want to use both n32 & n64"; + if use n32 && use n64 && use !multilib; then + eerror "Please enable multilib if you want to use both n32 & n64"; die "Invalid USE flag combination"; fi } @@ -752,7 +752,7 @@ gcc-library-configure() { gcc-compiler-configure() { # multilib support - if use !nomultilib && (use amd64 || use mips) + if use multilib && (use amd64 || use mips) then confgcc="${confgcc} --enable-multilib" else @@ -772,7 +772,7 @@ gcc-compiler-configure() { # Add --with-abi flags to enable respective MIPS ABIs case "${CCHOST}" in mips*) - use !nomultilib && myconf="${myconf} --with-abi=32" + use multilib && myconf="${myconf} --with-abi=32" use n64 && myconf="${myconf} --with-abi=n64" use n32 && myconf="${myconf} --with-abi=n32" ;; |