[PATCH] scripts : ver_linux does not report recent binutils version

Linux Kernel Mailing List <[email protected]> Fri, 12 May 2006 18:59:46 GMT
Newsgroups gmane.linux.kernel.commits.2-4
Message-ID <[email protected]>
commit 010896bc1ea1b8183dc0fbf6c4ec5fb6c86843d3
tree 9b2fa4d5de9b718cedc589aeda368832a9d122f9
parent 53767b06aebcfb9ee5255ceed4f41467f4734e8d
author Willy TARREAU <willy@pcw.(none)> Sun, 07 May 2006 21:53:31 +0200
committer Willy TARREAU <willy@pcw.(none)> Sun, 07 May 2006 21:53:31 +0200

[PATCH] scripts : ver_linux does not report recent binutils version

The 'ver_linux' script expects 'ld' to output a line starting with
'BFD', while recent versions of 'ld' print 'GNU ld'. The effect is
that binutils version is not listed in reports based on ver_linux.

The following trivial fix makes it do the right thing as 2.6 does.
Initially reported by Joshua Kwan. Tested and works.

Signed-off-by: Willy Tarreau <[email protected]>

- Willy

 scripts/ver_linux |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/ver_linux b/scripts/ver_linux
index 7c32eec..f9194b2 100644
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -22,7 +22,8 @@ make --version 2>&1 | awk -F, '{print $1
       '/GNU Make/{print "Gnu make              ",$NF}'
 
 ld -v 2>&1 | awk -F\) '{print $1}' | awk \
-      '/BFD/{print "binutils              ",$NF}'
+      '/BFD/{print "binutils              ",$NF} \
+       /^GNU/{print "binutils              ",$4}'
 
 fdformat --version | awk -F\- '{print "util-linux            ", $NF}'