diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-01-28 00:25:22 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-01-28 00:25:22 +0000 |
| commit | 9bb1e7f61b9a06fc5bb3d263d2b2e5f017663bcf (patch) | |
| tree | e3ed83fb04c93f90d713f8e7547ccccd171703e2 | |
| parent | Clean up old revisions, also closes bug #302202. (diff) | |
| download | gentoo-2-9bb1e7f61b9a06fc5bb3d263d2b2e5f017663bcf.tar.gz gentoo-2-9bb1e7f61b9a06fc5bb3d263d2b2e5f017663bcf.tar.bz2 gentoo-2-9bb1e7f61b9a06fc5bb3d263d2b2e5f017663bcf.zip | |
drop USE=gold and enable bfd/gold all the time (with bfd being the default) ... this implies dropping gold support in older binutils, but screw em #301480
| -rw-r--r-- | eclass/toolchain-binutils.eclass | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass index 77922c438ff7..16c1eca0acfe 100644 --- a/eclass/toolchain-binutils.eclass +++ b/eclass/toolchain-binutils.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# 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.88 2009/12/24 13:16:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.89 2010/01/28 00:25:22 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> # @@ -75,7 +75,7 @@ if version_is_at_least 2.18 ; then else LICENSE="|| ( GPL-2 LGPL-2 )" fi -IUSE="gold nls multitarget multislot test vanilla" +IUSE="nls multitarget multislot test vanilla" if use multislot ; then SLOT="${CTARGET}-${BVER}" elif is_cross ; then @@ -195,11 +195,9 @@ 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)" + # new versions allow gold and ld; screw older versions + if grep -q 'enable-gold=both/bfd' "${S}"/configure ; then + myconf="${myconf} --enable-gold=both/bfd" fi use nls \ && myconf="${myconf} --without-included-gettext" \ |