--- ../Python-3.7.0b4/configure.ac	2018-05-02 09:41:45.000000000 +0200
+++ configure.ac	2018-05-17 17:06:37.878125652 +0200
@@ -696,10 +696,10 @@ preset_cxx="$CXX"
 if test -z "$CXX"
 then
         case "$CC" in
-        gcc)    AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;;
-        cc)     AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;;
-        clang|*/clang)     AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;;
-        icc|*/icc)         AC_PATH_TOOL(CXX, [icpc], [icpc], [notfound]) ;;
+        gcc|*/gcc|*-gcc)    AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;;
+        cc|*/cc|*-cc)     AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;;
+        clang|*/clang|*-clang)     AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;;
+        icc|*/icc|*-icc)         AC_PATH_TOOL(CXX, [icpc], [icpc], [notfound]) ;;
         esac
 	if test "$CXX" = "notfound"
 	then
@@ -1317,7 +1317,7 @@ fi],
 [AC_MSG_RESULT(no)])
 if test "$Py_LTO" = 'true' ; then
   case $CC in
-    *clang*)
+    clang|*/clang|*-clang)
       case $ac_sys_system in
         Darwin*)
           # Any changes made here should be reflected in the GCC+Darwin case below
@@ -1328,7 +1328,7 @@ if test "$Py_LTO" = 'true' ; then
           ;;
       esac
       ;;
-    *gcc*)
+    gcc|*/gcc|*-gcc)
       case $ac_sys_system in
         Darwin*)
           LTOFLAGS="-flto -Wl,-export_dynamic"
@@ -1390,7 +1390,7 @@ then
 fi
 LLVM_PROF_ERR=no
 case $CC in
-  *clang*)
+  clang|*/clang|*-clang)
     # Any changes made here should be reflected in the GCC+Darwin case below
     PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
     PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
@@ -1405,7 +1405,7 @@ case $CC in
       fi
     fi
     ;;
-  *gcc*)
+  gcc|*/gcc|*-gcc)
     case $ac_sys_system in
       Darwin*)
         PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
@@ -1429,7 +1429,7 @@ case $CC in
         ;;
     esac
     ;;
-  *icc*)
+  icc|*/icc|*-icc)
     PGO_PROF_GEN_FLAG="-prof-gen"
     PGO_PROF_USE_FLAG="-prof-use"
     LLVM_PROF_MERGER="true"
@@ -1467,7 +1467,7 @@ then
         fi
 
         case $CC in
-            *clang*)
+            clang|*/clang*-clang)
                 cc_is_clang=1
                 ;;
             *)
@@ -1591,7 +1591,7 @@ yes)
     # ICC doesn't recognize the option, but only emits a warning
     ## XXX does it emit an unused result warning and can it be disabled?
     case "$CC" in
-    *icc*)
+    icc|*/icc|*-icc)
     ac_cv_disable_unused_result_warning=no
     ;;
     *)
@@ -1893,7 +1893,7 @@ esac
 
 # ICC needs -fp-model strict or floats behave badly
 case "$CC" in
-*icc*)
+icc|*/icc|*-icc)
     CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict"
     ;;
 esac
@@ -2655,7 +2655,7 @@ then
 			LINKFORSHARED="-Wl,--export-dynamic"
 		fi;;
 	SunOS/5*) case $CC in
-		  *gcc*)
+		  gcc|*/gcc|*-gcc)
 		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
 		    then
 			LINKFORSHARED="-Xlinker --export-dynamic"
@@ -5333,7 +5333,7 @@ if test "$have_gcc_asm_for_x87" = yes; t
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491
     # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html
     case $CC in
-        *gcc*)
+        gcc|*/gcc|*-gcc)
             AC_MSG_CHECKING(for gcc ipa-pure-const bug)
             saved_cflags="$CFLAGS"
             CFLAGS="-O2"