summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-08-12 20:30:20 +0000
committerMike Frysinger <vapier@gentoo.org>2011-08-12 20:30:20 +0000
commit7aa2fe8d2502206453c41ce886f34b185821455d (patch)
tree0dd1192cb0a44fb18380e5752613d01a6fe3a8a2 /sys-devel
parentAdd options to switch the linker on the fly between gold and bfd, and clean u... (diff)
downloadgentoo-2-7aa2fe8d2502206453c41ce886f34b185821455d.tar.gz
gentoo-2-7aa2fe8d2502206453c41ce886f34b185821455d.tar.bz2
gentoo-2-7aa2fe8d2502206453c41ce886f34b185821455d.zip
Also support linker switching for current profile, and add some helpful user output so they can see what is going on.
(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/binutils-config/ChangeLog6
-rwxr-xr-xsys-devel/binutils-config/files/binutils-config-38
2 files changed, 10 insertions, 4 deletions
diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index 3eade60c272b..f127733764ed 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-devel/binutils-config
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.45 2011/08/12 20:26:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.46 2011/08/12 20:30:20 vapier Exp $
+
+ 12 Aug 2011; Mike Frysinger <vapier@gentoo.org> files/binutils-config-3:
+ Also support linker switching for current profile, and add some helpful user
+ output so they can see what is going on.
*binutils-config-3 (12 Aug 2011)
diff --git a/sys-devel/binutils-config/files/binutils-config-3 b/sys-devel/binutils-config/files/binutils-config-3
index 967492789e0b..1dee21c12a13 100755
--- a/sys-devel/binutils-config/files/binutils-config-3
+++ b/sys-devel/binutils-config/files/binutils-config-3
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.1 2011/08/12 20:26:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.2 2011/08/12 20:30:20 vapier Exp $
# Format of /etc/env.d/binutils/:
# config-TARGET: CURRENT=version for TARGET
@@ -343,7 +343,9 @@ switch_linker() {
fi
# switch it up
+ ebegin "Setting default linker to ${ld} for ${PROFILE}"
ln -sf ld.${ld} "${BINPATH}"/ld
+ eend $?
}
switch_linker_gold() { switch_linker gold ; }
switch_linker_bfd() { switch_linker bfd ; }
@@ -387,7 +389,7 @@ while [[ $# -gt 0 ]] ; do
-h|--help) usage 0 ;;
-V|--version)
unset Header
- cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.1 2011/08/12 20:26:09 vapier Exp $"
+ cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.2 2011/08/12 20:30:20 vapier Exp $"
cvsver=${cvsver##*binutils-config-}
bver=${cvsver%%,v *}
cvsver=${cvsver#* }
@@ -432,7 +434,7 @@ set_HOST
case ${DOIT} in
switch_profile|switch_linker_*)
# decode user's profile choice
- x=${UARG}
+ x=${UARG:-$(TARGET=${HOST} set_current_profile)}
PROFILE=""
if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
# User gave us a # representing the profile