https://github.com/python/cpython/commit/4ce10da36ff4c29dbf2cc40ebfcbcd260b635e05 commit: 4ce10da36ff4c29dbf2cc40ebfcbcd260b635e05 branch: main author: Erlend E. Aasland <[email protected]> committer: erlend-aasland <[email protected]> date: 2024-04-12T16:33:29+02:00 summary:
gh-96398: Detect emcc and mpicc in compiler names in configure (#117819) - emcc defines __EMSCRIPTEN__ - mpicc doesn't define anything in particular; detect it using basename files: M configure M configure.ac diff --git a/configure b/configure index 65210e8e0b9ce0..027ef83807b939 100755 --- a/configure +++ b/configure @@ -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 ece3fe78fcf2a1..35b3a4e129e0ef 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 _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: [email protected]
