From 7988efc06a8cefdec02913f7b75e6e199df9cee4 Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 25 Sep 2016 11:37:41 +0200
Subject: [PATCH] test: Handle CC="gcc -std=gnu99" gracefully

Based on a suggestion by Eric Bavier.
---
 test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test.sh b/test.sh
index 6ca18c9bf..b46feaad3 100755
--- a/test.sh
+++ b/test.sh
@@ -3380,11 +3380,11 @@ upgrade
 input_charset
 "
 
-compiler_location=$(which $COMPILER)
+compiler_location=$(which $(echo "$COMPILER" | awk '{print $1}'))
 if [ "$compiler_location" = "$COMPILER" ]; then
     echo "Compiler:         $COMPILER"
 else
-    echo "Compiler:         $COMPILER ($(which $COMPILER))"
+    echo "Compiler:         $COMPILER ($compiler_location)"
 fi
 echo "Compiler version: $($COMPILER --version | head -n 1)"
 echo
-- 
2.47.2