From 06cd604ec6d34f25b436ab729543418042a87e1c Mon Sep 17 00:00:00 2001 From: Krzysztof Konopko Date: Thu, 9 Mar 2017 09:01:36 +0100 Subject: [PATCH] toolchain/external: use -dumpversion to check gcc version Currently, `--version` option is used and later matched with a regex to get the actual gcc version. There's a dedicated gcc option to do exactly that: `-dumpversion`. Also `--version` may return a string customised by a vendor that provides the toolchain, which makes the current regex approach error prone. In fact, this situation has been seen with a real customised toolchain. Signed-off-by: Krzysztof Konopko Signed-off-by: Tomasz Szkutkowski Signed-off-by: Thomas Petazzoni --- toolchain/helpers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 6f87230796..6044b7e5f4 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -148,7 +148,7 @@ check_gcc_version = \ if [ -z "$${expected_version}" ]; then \ exit 0 ; \ fi; \ - real_version=`$(1) --version | sed -r -e '1!d; s/^[^)]+\) ([^[:space:]]+).*/\1/;'` ; \ + real_version=`$(1) -dumpversion` ; \ if [[ ! "$${real_version}" =~ ^$${expected_version}\. ]] ; then \ printf "Incorrect selection of gcc version: expected %s.x, got %s\n" \ "$${expected_version}" "$${real_version}" ; \ -- 2.30.2