summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesper Juhl <jesper.juhl@gmail.com>2007-08-02 03:21:15 +0400
committerSam Ravnborg <sam@neptun.(none)>2007-10-12 23:15:31 +0400
commitcc9eefdb9ed5603e2ab0b77fc1f6b671332ceeed (patch)
tree6d93d16e3259174c96396e126c5053e79955a110
parent9cc3ef30346da96f3dd7f2e328e8a5ff46a37fd9 (diff)
downloadlinux-cc9eefdb9ed5603e2ab0b77fc1f6b671332ceeed.tar.xz
kbuild: scripts/ver_linux : correct printing of binutils version
Currently scripts/ver_linux prints "Binutils" or other random information for the version number in the "binutils" output line on some distributions. This patch corrects that. When I initially submitted a patch to correct that, I was not aware that the output from "ld -v" could differ as much as it turned out it can, so my original fix turned out to not cover all bases. This patch works correctly with all the different "ld -v" output that people posted in replys to my first patch, so it should be a clear win over what we have currently. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rwxr-xr-xscripts/ver_linux4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux
index 5a16bad72595..ab69ecefedbd 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -21,9 +21,7 @@ gcc --version 2>&1| grep gcc | awk \
make --version 2>&1 | awk -F, '{print $1}' | awk \
'/GNU Make/{print "Gnu make ",$NF}'
-ld -v | awk -F\) '{print $1}' | awk \
-'/BFD/{print "binutils ",$NF} \
-/^GNU/{print "binutils ",$4}'
+echo "binutils $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')"
echo -n "util-linux "
fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$//