summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Kapshuk <alexander.kapshuk@gmail.com>2015-10-12 21:39:41 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-17 21:55:26 -0700
commit235024e519fa16242f916ec41b00547582f561a7 (patch)
tree0710521e6dbeab0c05763dba681e276df34eb3c4
parentb4c3fcb3c71f26ec18e06721cb3b6bcb314834f3 (diff)
ver_linux: gcc -dumpversion, use regex to find version number
Rely on regex to find the version number, rather than a field number. Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rwxr-xr-xscripts/ver_linux8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux
index 7de36df4eaa5..af6467e4859a 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -11,8 +11,12 @@ echo ' '
uname -a
echo ' '
-gcc -dumpversion 2>&1| awk \
-'NR==1{print "Gnu C ", $1}'
+gcc -dumpversion 2>&1 |
+awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
+ match($0, /[0-9]+([.]?[0-9]+)+/)
+ printf("GNU C\t\t\t%s\n",
+ substr($0,RSTART,RLENGTH))
+}'
make --version 2>&1 | awk -F, '{print $1}' | awk \
'/GNU Make/{print "Gnu make ",$NF}'