[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass

[Mike Frysinger (vapier)]

vapier      12/06/03 09:02:36

  Modified:             toolchain.eclass
  Log:
  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)

Revision  Changes    Path
1.547                eclass/toolchain.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.547&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.547&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.546&r2=1.547

Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -r1.546 -r1.547
--- toolchain.eclass	3 Jun 2012 09:00:54 -0000	1.546
+++ toolchain.eclass	3 Jun 2012 09:02:36 -0000	1.547
@@ -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@g.o>
 
@@ -811,10 +811,12 @@
 }
 
 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