handle yet newer style of gold+bfd parallel installs configure option #315995 by...

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 7f25920ec2ff0fbd315c4012c8dd30586a446933..447f0d3777ed7773e275520cbc469d822cdf643a 100644 (file)
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -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@gentoo.org>
 #
@@ -196,7 +196,9 @@ toolchain-binutils_src_compile() {
        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 \