diff options
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 12 insertions, 2 deletions
@@ -6110,7 +6110,9 @@ then : else $as_nop cat > conftest.c <<EOF -#if defined(__INTEL_COMPILER) || defined(__ICC) +#if defined(__EMSCRIPTEN__) + emcc +#elif defined(__INTEL_COMPILER) || defined(__ICC) icc #elif defined(__ibmxl__) || defined(__xlc__) || defined(__xlC__) xlc @@ -6127,6 +6129,9 @@ EOF if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then ac_cv_cc_name=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '` + if $(expr "//$CC" : '.*/\(.*\)') = "mpicc"; then + ac_cv_cc_name="mpicc" + fi else ac_cv_cc_name="unknown" fi diff --git a/configure.ac b/configure.ac index ece3fe7..35b3a4e 100644 --- a/configure.ac +++ b/configure.ac @@ -992,7 +992,9 @@ dnl check for GCC last, other compilers set __GNUC__, too. dnl msvc is listed for completeness. AC_CACHE_CHECK([for CC compiler name], [ac_cv_cc_name], [ cat > conftest.c <<EOF -#if defined(__INTEL_COMPILER) || defined(__ICC) +#if defined(__EMSCRIPTEN__) + emcc +#elif defined(__INTEL_COMPILER) || defined(__ICC) icc #elif defined(__ibmxl__) || defined(__xlc__) || defined(__xlC__) xlc @@ -1009,6 +1011,9 @@ EOF if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then ac_cv_cc_name=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '` + if $(expr "//$CC" : '.*/\(.*\)') = "mpicc"; then + ac_cv_cc_name="mpicc" + fi else ac_cv_cc_name="unknown" fi |