From 406a7e8b2a86d6340e7dab9fb1d4326b5af3f78f Mon Sep 17 00:00:00 2001
From: Lukas van de Wiel <30800501+LukasvdWiel@users.noreply.github.com>
Date: Sun, 23 Jul 2023 01:20:03 +0200
Subject: [PATCH] gh-106962: Detect mpicc in configure.ac (#106961)

Don't let autoconf mistake MPI compilers for Intel compilers;
filter out the MPI case to prevent Intel specific options from being applied.
---
 .../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 000000000000000..32e196fe26d3b77
--- /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 e6fb5e3c2b0c2fc..18d404c8dc06050 100755
--- a/configure
+++ b/configure
@@ -10154,6 +10154,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 a1ee78047692fdb..cdb88a3071976c0 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"