summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2023-07-23 00:01:44 (GMT)
committerGitHub <noreply@github.com>2023-07-23 00:01:44 (GMT)
commitd87d67b9e65c38dd6d1d378a5c013eccf50756f1 (patch)
tree6621b52d15ba513ec813a5cde06f2bc27fab2e57
parent0d4a76654f755d091c14cfa1e57bcfa6333ae05a (diff)
downloadcpython-d87d67b9e65c38dd6d1d378a5c013eccf50756f1.zip
cpython-d87d67b9e65c38dd6d1d378a5c013eccf50756f1.tar.gz
cpython-d87d67b9e65c38dd6d1d378a5c013eccf50756f1.tar.bz2
[3.12] gh-106962: Detect mpicc in configure.ac (GH-106961) (#107081)
Don't let autoconf mistake MPI compilers for Intel compilers; filter out the MPI case to prevent Intel specific options from being applied. (cherry picked from commit 9a6b278769b9f24e0650283f6c347db8ae52b7b3) Co-authored-by: Lukas van de Wiel <30800501+LukasvdWiel@users.noreply.github.com>
-rw-r--r--Misc/NEWS.d/next/Build/2023-07-23-00-38-51.gh-issue-106962.VVYrWB.rst1
-rwxr-xr-xconfigure3
-rw-r--r--configure.ac3
3 files changed, 7 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Build/2023-07-23-00-38-51.gh-issue-106962.VVYrWB.rst b/Misc/NEWS.d/next/Build/2023-07-23-00-38-51.gh-issue-106962.VVYrWB.rst
new file mode 100644
index 0000000..32e196f
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2023-07-23-00-38-51.gh-issue-106962.VVYrWB.rst
@@ -0,0 +1 @@
+Detect MPI compilers in :file:`configure`.
diff --git a/configure b/configure
index 91bf1d2..3806da7 100755
--- a/configure
+++ b/configure
@@ -10179,6 +10179,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
esac
case "$CC" in
+*mpicc*)
+ CFLAGS_NODIST="$CFLAGS_NODIST"
+ ;;
*icc*)
# ICC needs -fp-model strict or floats behave badly
CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict"
diff --git a/configure.ac b/configure.ac
index 0770f68..630db4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2656,6 +2656,9 @@ yes)
esac
case "$CC" in
+*mpicc*)
+ CFLAGS_NODIST="$CFLAGS_NODIST"
+ ;;
*icc*)
# ICC needs -fp-model strict or floats behave badly
CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict"