From 54a5aba7ee12449c73633e8b690b435cea92ff56 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 10 May 2017 16:27:17 -0700 Subject: [PATCH] detect_cc.sh: further fix CC_TYPE generation FreeBSD clang prepends "FreeBSD" before clang in the version string, so further fixes are needed. Signed-off-by: Jim Harris Change-Id: I7bfc37322483b97443985f1103ff753d1b18a87a --- scripts/detect_cc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/detect_cc.sh b/scripts/detect_cc.sh index b618186e9..6c13213b0 100755 --- a/scripts/detect_cc.sh +++ b/scripts/detect_cc.sh @@ -52,8 +52,8 @@ for i in "$@"; do esac done -CC_TYPE=$($CC -v 2>&1 | grep -w version | awk '{print $1}') -CXX_TYPE=$($CXX -v 2>&1 | grep -w version | awk '{print $1}') +CC_TYPE=$($CC -v 2>&1 | grep -o -E '\w+ version' | awk '{ print $1 }') +CXX_TYPE=$($CXX -v 2>&1 | grep -o -E '\w+ version' | awk '{ print $1 }') LD_TYPE=$(ld -v 2>&1 | awk '{print $2}') if [ "$CC_TYPE" != "$CXX_TYPE" ]; then