Check for "gnu-cc" in compiler version string.

Conda gcc doesn't seem to have "gcc" or "GCC" in the version string anymore (#46).
devinamatthews · Apr 22, 2022 · 7d979b6 · 7d979b6
1 parent 50093e4
commit 7d979b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/configure b/configure
@@ -6706,7 +6706,10 @@ if test x"$vendor_string" = x; then
     as_fn_error $? "Unable to determine compiler vendor." "$LINENO" 5
 fi
 
-cc_vendor=`echo $vendor_string | $EGREP -oi 'icc|gcc|clang|emcc|pnacl|IBM' | tr 'A-Z' 'a-z' | { read first rest ; echo $first ; }`
+cc_vendor=`echo $vendor_string | $EGREP -oi 'icc|gcc|clang|emcc|pnacl|IBM|gnu-cc' | tr 'A-Z' 'a-z' | { read first rest ; echo $first ; }`
+if test x"$cc_vendor" = "xgnu-cc"; then
+    cc_vendor=gcc
+fi
 if test x"$cc_vendor" = x; then
     as_fn_error $? "Unable to determine compiler vendor." "$LINENO" 5
 fi

diff --git a/configure.ac b/configure.ac
@@ -200,7 +200,10 @@ if test x"$vendor_string" = x; then
     AC_MSG_ERROR([Unable to determine compiler vendor.])
 fi
 
-cc_vendor=`echo $vendor_string | $EGREP -oi 'icc|gcc|clang|emcc|pnacl|IBM' | tr 'A-Z' 'a-z' | { read first rest ; echo $first ; }`
+cc_vendor=`echo $vendor_string | $EGREP -oi 'icc|gcc|clang|emcc|pnacl|IBM|gnu-cc' | tr 'A-Z' 'a-z' | { read first rest ; echo $first ; }`
+if test x"$cc_vendor" = "xgnu-cc"; then
+    cc_vendor=gcc
+fi
 if test x"$cc_vendor" = x; then
     AC_MSG_ERROR([Unable to determine compiler vendor.])
 fi