summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-05-03 02:32:23 +0000
committerMike Frysinger <vapier@gentoo.org>2012-05-03 02:32:23 +0000
commit6800b4dcde770ba68a11798f82d5f599e4365714 (patch)
treeb38d73cf1088cdb8f3c6acedd0efc301b3c339e4 /eclass/toolchain-binutils.eclass
parentrefine the xz usage to a newer version (diff)
downloadgentoo-2-6800b4dcde770ba68a11798f82d5f599e4365714.tar.gz
gentoo-2-6800b4dcde770ba68a11798f82d5f599e4365714.tar.bz2
gentoo-2-6800b4dcde770ba68a11798f82d5f599e4365714.zip
add USE=cxx to control gold usage
Diffstat (limited to 'eclass/toolchain-binutils.eclass')
-rw-r--r--eclass/toolchain-binutils.eclass26
1 files changed, 14 insertions, 12 deletions
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index cddc27330430..a1db31be7e4a 100644
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -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-binutils.eclass,v 1.113 2012/05/03 02:29:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.114 2012/05/03 02:32:23 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
#
@@ -90,7 +90,7 @@ if version_is_at_least 2.18 ; then
else
LICENSE="|| ( GPL-2 LGPL-2 )"
fi
-IUSE="nls multitarget multislot static-libs test vanilla"
+IUSE="cxx nls multitarget multislot static-libs test vanilla"
if version_is_at_least 2.19 ; then
IUSE+=" zlib"
fi
@@ -227,16 +227,18 @@ toolchain-binutils_src_compile() {
set --
# enable gold if available (installed as ld.gold)
- if grep -q 'enable-gold=default' "${S}"/configure ; then
- set -- "$@" --enable-gold
- # old ways - remove when 2.21 is stable
- elif grep -q 'enable-gold=both/ld' "${S}"/configure ; then
- set -- "$@" --enable-gold=both/ld
- elif grep -q 'enable-gold=both/bfd' "${S}"/configure ; then
- set -- "$@" --enable-gold=both/bfd
- fi
- if grep -q -e '--enable-plugins' "${S}"/ld/configure ; then
- set -- "$@" --enable-plugins
+ if use cxx ; then
+ if grep -q 'enable-gold=default' "${S}"/configure ; then
+ set -- "$@" --enable-gold
+ # old ways - remove when 2.21 is stable
+ elif grep -q 'enable-gold=both/ld' "${S}"/configure ; then
+ set -- "$@" --enable-gold=both/ld
+ elif grep -q 'enable-gold=both/bfd' "${S}"/configure ; then
+ set -- "$@" --enable-gold=both/bfd
+ fi
+ if grep -q -e '--enable-plugins' "${S}"/ld/configure ; then
+ set -- "$@" --enable-plugins
+ fi
fi
use nls \