Make ld --version output matching grok gold's output adapted from from upstream branch roland/gold-vs-libc Signed-off-by: Khem Raj Upstream-Status: Backport Index: git/configure =================================================================== --- git.orig/configure 2014-08-29 10:32:34.464070587 -0700 +++ git/configure 2014-08-29 10:32:34.456070587 -0700 @@ -4592,7 +4592,7 @@ # Found it, now check the version. { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5 $as_echo_n "checking version of $LD... " >&6; } - ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; 2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*) Index: git/configure.ac =================================================================== --- git.orig/configure.ac 2014-08-29 10:32:34.464070587 -0700 +++ git/configure.ac 2014-08-29 10:32:34.460070587 -0700 @@ -930,7 +930,7 @@ [GNU assembler.* \([0-9]*\.[0-9.]*\)], [2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], AS=: critic_missing="$critic_missing as") AC_CHECK_PROG_VER(LD, $LD, --version, - [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], + [GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\)], [2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld") # These programs are version sensitive.