diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-11-21 05:06:48 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-11-21 05:06:48 +0000 |
| commit | 98e6cd753fce0732794f8bfde28628267d8ab875 (patch) | |
| tree | 121d94616156ee061f5dea499e43877f903a9cd0 /eclass/toolchain-binutils.eclass | |
| parent | Update homepage url (diff) | |
| download | gentoo-2-98e6cd753fce0732794f8bfde28628267d8ab875.tar.gz gentoo-2-98e6cd753fce0732794f8bfde28628267d8ab875.tar.bz2 gentoo-2-98e6cd753fce0732794f8bfde28628267d8ab875.zip | |
handle newer gold options where it can be installed with ld at the same time
Diffstat (limited to 'eclass/toolchain-binutils.eclass')
| -rw-r--r-- | eclass/toolchain-binutils.eclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass index 5002759f2815..0908993fc98b 100644 --- a/eclass/toolchain-binutils.eclass +++ b/eclass/toolchain-binutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.85 2009/09/06 16:58:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.86 2009/11/21 05:06:48 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> # @@ -198,6 +198,12 @@ toolchain-binutils_src_compile() { cd "${MY_BUILDDIR}" local myconf="" + # new versions allow gold and ld while older allowed only one + if grep -q 'gold.*yes,both' "${S}"/configure ; then + myconf="${myconf} $(use_enable gold gold both) --enable-linker=bfd" + else + myconf="${myconf} $(use_enable gold)" + fi use nls \ && myconf="${myconf} --without-included-gettext" \ || myconf="${myconf} --disable-nls" @@ -221,7 +227,6 @@ toolchain-binutils_src_compile() { --enable-64-bit-bfd \ --enable-shared \ --disable-werror \ - $(use_enable gold) \ ${myconf} ${EXTRA_ECONF}" echo ./configure ${myconf} "${S}"/configure ${myconf} || die "configure failed" |