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

[Mike Frysinger (vapier)]

vapier      10/04/19 23:02:57

  Modified:             toolchain-binutils.eclass
  Log:
  handle yet newer style of gold+bfd parallel installs configure option #315995 by Johannes Nixdorf

Revision  Changes    Path
1.91                 eclass/toolchain-binutils.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-binutils.eclass?r1=1.90&r2=1.91

Index: toolchain-binutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- toolchain-binutils.eclass	7 Mar 2010 16:32:07 -0000	1.90
+++ toolchain-binutils.eclass	19 Apr 2010 23:02:56 -0000	1.91
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.90 2010/03/07 16:32:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.91 2010/04/19 23:02:56 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@g.o>
 #
@@ -196,7 +196,9 @@
 	cd "${MY_BUILDDIR}"
 	local myconf=""
 	# new versions allow gold and ld; screw older versions
-	if grep -q 'enable-gold=both/bfd' "${S}"/configure ; then
+	if grep -q 'enable-gold=both/ld' "${S}"/configure ; then
+		myconf="${myconf} --enable-gold=both/ld"
+	elif grep -q 'enable-gold=both/bfd' "${S}"/configure ; then
 		myconf="${myconf} --enable-gold=both/bfd"
 	fi
 	use nls \