]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-106962: Detect mpicc in configure.ac (GH-106961) (#107081)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sun, 23 Jul 2023 00:01:44 +0000 (17:01 -0700)
committerGitHub <noreply@github.com>
Sun, 23 Jul 2023 00:01:44 +0000 (00:01 +0000)
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>
Misc/NEWS.d/next/Build/2023-07-23-00-38-51.gh-issue-106962.VVYrWB.rst [new file with mode: 0644]
configure
configure.ac

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 (file)
index 0000000..32e196f
--- /dev/null
@@ -0,0 +1 @@
+Detect MPI compilers in :file:`configure`.
index 91bf1d2c02370265a475afa55bab7b1511e08cb0..3806da7723fdaf9b24c1d1068f46ffb6c05cd11a 100755 (executable)
--- 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"
index 0770f68a23f61f57a22f36710efc9f2ef1c60459..630db4bfbd53cc6bd39ac4a24f40747d37f699b7 100644 (file)
@@ -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"