[gentoo-dev] [PATCH 2/2] toolchain-funcs.eclass: use gcc-{ar,nm,ranlib} when available

[Mike Gilbert]

This will come in handy for users who enable LTO, since they need to use
the gcc wrappers for 'ar', 'nm', and 'ranlib'.

The default program search order becomes:

${CHOST}-gcc-ar
${CHOST}-ar
gcc-ar
ar

This matches the behavior of a typical autoconf call:

AC_CHECK_TOOLS(AR, [gcc-ar ar])
---
 eclass/toolchain-funcs.eclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index b402a9ff2780..d1f9ac019362 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -69,7 +69,7 @@ tc-getPROG() { _tc-getPROG CHOST "$@"; }
 # @FUNCTION: tc-getAR
 # @USAGE: [toolchain prefix]
 # @RETURN: name of the archiver
-tc-getAR() { tc-getPROG AR ar "$@"; }
+tc-getAR() { tc-getPROG AR gcc-ar:ar "$@"; }
 # @FUNCTION: tc-getAS
 # @USAGE: [toolchain prefix]
 # @RETURN: name of the assembler
@@ -97,11 +97,11 @@ tc-getSTRIP() { tc-getPROG STRIP strip "$@"; }
 # @FUNCTION: tc-getNM
 # @USAGE: [toolchain prefix]
 # @RETURN: name of the symbol/object thingy
-tc-getNM() { tc-getPROG NM nm "$@"; }
+tc-getNM() { tc-getPROG NM gcc-nm:nm "$@"; }
 # @FUNCTION: tc-getRANLIB
 # @USAGE: [toolchain prefix]
 # @RETURN: name of the archiver indexer
-tc-getRANLIB() { tc-getPROG RANLIB ranlib "$@"; }
+tc-getRANLIB() { tc-getPROG RANLIB gcc-ranlib:ranlib "$@"; }
 # @FUNCTION: tc-getOBJCOPY
 # @USAGE: [toolchain prefix]
 # @RETURN: name of the object copier
@@ -142,7 +142,7 @@ tc-getDLLWRAP() { tc-getPROG DLLWRAP dllwrap "$@"; }
 # @FUNCTION: tc-getBUILD_AR
 # @USAGE: [toolchain prefix]
 # @RETURN: name of the archiver for building binaries to run on the build machine
-tc-getBUILD_AR() { tc-getBUILD_PROG AR ar "$@"; }
+tc-getBUILD_AR() { tc-getBUILD_PROG AR gcc-ar:ar "$@"; }
 # @FUNCTION: tc-getBUILD_AS
 # @USAGE: [toolchain prefix]
 # @RETURN: name of the assembler for building binaries to run on the build machine
@@ -170,11 +170,11 @@ tc-getBUILD_STRIP() { tc-getBUILD_PROG STRIP strip "$@"; }
 # @FUNCTION: tc-getBUILD_NM
 # @USAGE: [toolchain prefix]
 # @RETURN: name of the symbol/object thingy for building binaries to run on the build machine
-tc-getBUILD_NM() { tc-getBUILD_PROG NM nm "$@"; }
+tc-getBUILD_NM() { tc-getBUILD_PROG NM gcc-nm:nm "$@"; }
 # @FUNCTION: tc-getBUILD_RANLIB
 # @USAGE: [toolchain prefix]
 # @RETURN: name of the archiver indexer for building binaries to run on the build machine
-tc-getBUILD_RANLIB() { tc-getBUILD_PROG RANLIB ranlib "$@"; }
+tc-getBUILD_RANLIB() { tc-getBUILD_PROG RANLIB gcc-ranlib:ranlib "$@"; }
 # @FUNCTION: tc-getBUILD_OBJCOPY
 # @USAGE: [toolchain prefix]
 # @RETURN: name of the object copier for building binaries to run on the build machine
-- 
2.13.0