From d87d67b9e65c38dd6d1d378a5c013eccf50756f1 Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 22 Jul 2023 17:01:44 -0700
Subject: [PATCH] [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>
---
 .../next/Build/2023-07-23-00-38-51.gh-issue-106962.VVYrWB.rst  | 1 +
 configure                                                      | 3 +++
 configure.ac                                                   | 3 +++
 3 files changed, 7 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Build/2023-07-23-00-38-51.gh-issue-106962.VVYrWB.rst

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 000000000000..32e196fe26d3
--- /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 91bf1d2c0237..3806da7723fd 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 0770f68a23f6..630db4bfbd53 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"
-- 
2.47.3