Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Erlend E. Aasland 2024-04-12 16:33:29 +02:00 committed by GitHub
parent 2d3d9b4461
commit 4ce10da36f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure generated vendored
View File

@ -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

7
configure.ac
View File

@ -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