diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-10-11 23:53:59 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-10-11 23:53:59 +0000 |
| commit | c7b013bac01b7e2871d08b8ffe9749fc530193af (patch) | |
| tree | bfc6e83ee50359d353f95b1c2230f91ee6d19e75 /eclass | |
| parent | Make sure visibility-change flags are being filtered out of KDE to avoid them... (diff) | |
| download | gentoo-2-c7b013bac01b7e2871d08b8ffe9749fc530193af.tar.gz gentoo-2-c7b013bac01b7e2871d08b8ffe9749fc530193af.tar.bz2 gentoo-2-c7b013bac01b7e2871d08b8ffe9749fc530193af.zip | |
Set MULTILIB_ABIS to DEFAULT_ABI if ! use multilib.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index a16c84f87ea8..49c42652d0be 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.207 2005/10/11 00:00:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.208 2005/10/11 23:53:59 eradicator Exp $ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" LICENSE="GPL-2 LGPL-2.1" @@ -833,7 +833,12 @@ gcc_pkg_setup() { esac # Setup variables which would normally be in the profile - is_crosscompile && is_multilib && multilib_env ${CTARGET} + if is_crosscompile ; then + multilib_env ${CTARGET} + if ! use multilib ; then + MULTILIB_ABIS=${DEFAULT_ABI} + fi + fi # we dont want to use the installed compiler's specs to build gcc! unset GCC_SPECS @@ -2130,7 +2135,7 @@ is_multilib() { *-uclibc) false ;; x86_64*|mips64*|powerpc64*|sparc64*) - is_crosscompile || has_multilib_profile || use multilib ;; + has_multilib_profile || use multilib ;; *) false ;; esac |