diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-06-03 09:02:36 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-06-03 09:02:36 +0000 |
| commit | 5156ac851f88c38d97b2bdbb447173fd37b0d80d (patch) | |
| tree | 5b9e56f82a9207f83ef453b6c49a19a0ca6f959e /eclass | |
| parent | Re-add ffmpeg-0.11 patch (diff) | |
| download | gentoo-2-5156ac851f88c38d97b2bdbb447173fd37b0d80d.tar.gz gentoo-2-5156ac851f88c38d97b2bdbb447173fd37b0d80d.tar.bz2 gentoo-2-5156ac851f88c38d97b2bdbb447173fd37b0d80d.zip | |
always build up the multilib list for gcc even when --disable-multilib as it needs that info when picking the default target (to make native x32 work again)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 56f9a835e6ba..3619598c723e 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.546 2012/06/03 09:00:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.547 2012/06/03 09:02:36 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -811,10 +811,12 @@ gcc-abi-map() { } gcc-multilib-configure() { - # if multilib is disabled, get out quick! if ! is_multilib ; then confgcc+=" --disable-multilib" - return + # Fun times: if we are building for a target that has multiple + # possible ABI formats, and the user has told us to pick one + # that isn't the default, then not specifying it via the list + # below will break that on us. else confgcc+=" --enable-multilib" fi |