[gentoo-commits] gentoo-x86 commit in eclass: toolchain-funcs.eclass

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      15/04/13 05:38:17

  Modified:             toolchain-funcs.eclass
  Log:
  tc-ld-disable-gold: handle LD having flags appended to it #545218

Revision  Changes    Path
1.137                eclass/toolchain-funcs.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-funcs.eclass?rev=1.137&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-funcs.eclass?rev=1.137&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-funcs.eclass?r1=1.136&r2=1.137

Index: toolchain-funcs.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- toolchain-funcs.eclass	31 Mar 2015 04:27:29 -0000	1.136
+++ toolchain-funcs.eclass	13 Apr 2015 05:38:17 -0000	1.137
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.136 2015/03/31 04:27:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.137 2015/04/13 05:38:17 vapier Exp $
 
 # @ECLASS: toolchain-funcs.eclass
 # @MAINTAINER:
@@ -352,7 +352,10 @@
 	ewarn "Forcing usage of the BFD linker instead of GOLD"
 
 	# Set up LD to point directly to bfd if it's available.
-	local bfd_ld="$(tc-getLD "$@").bfd"
+	# We need to extract the first word in case there are flags appended
+	# to its value (like multilib).  #545218
+	local ld=$(tc-getLD "$@")
+	local bfd_ld="${ld%% *}.bfd"
 	local path_ld=$(which "${bfd_ld}" 2>/dev/null)
 	[[ -e ${path_ld} ]] && export LD=${bfd_ld}