From 1cf8ef67de9c39cfc2d982a83bd7f3c2fc3c9fca Mon Sep 17 00:00:00 2001
From: Hans Pabst <hans.pabst@intel.com>
Date: Wed, 6 Apr 2022 13:59:52 +0200
Subject: [PATCH] toolchain: support Intel MPI with GNU Compiler Collection
 (#2055)

* Note: fallback for, e.g., "mpiicpc" was wrong (using GCC already)
---
 .../scripts/stage1/install_intelmpi.sh        | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/tools/toolchain/scripts/stage1/install_intelmpi.sh b/tools/toolchain/scripts/stage1/install_intelmpi.sh
index 3cc5274f15..6fbaf41ffd 100755
--- a/tools/toolchain/scripts/stage1/install_intelmpi.sh
+++ b/tools/toolchain/scripts/stage1/install_intelmpi.sh
@@ -33,15 +33,15 @@ case "${with_intelmpi}" in
   __SYSTEM__)
     echo "==================== Finding Intel MPI from system paths ===================="
     check_command mpirun "intelmpi" && MPIRUN="$(command -v mpirun)" || exit 1
-    check_command mpiicc "intelmpi" && MPICC="$(command -v mpiicc)" || exit 1
-    if [ $(command -v mpiicpc) ]; then
-      check_command mpiicpc "intelmpi" && MPICXX="$(command -v mpiicpc)"
-    elif [ $(command -v mpic++) ]; then
-      check_command mpic++ "intelmpi" && MPICXX="$(command -v mpic++)"
+    if [ "${with_intel}" != "__DONTUSE__" ]; then
+      check_command mpiicc "intelmpi" && MPICC="$(command -v mpiicc)" || exit 1
+      check_command mpiicpc "intelmpi" && MPICXX="$(command -v mpiicpc)" || exit 1
+      check_command mpiifort "intelmpi" && MPIFC="$(command -v mpiifort)" || exit 1
     else
+      check_command mpicc "intelmpi" && MPICC="$(command -v mpicc)" || exit 1
       check_command mpicxx "intelmpi" && MPICXX="$(command -v mpicxx)" || exit 1
+      check_command mpif90 "intelmpi" && MPIFC="$(command -v mpif90)" || exit 1
     fi
-    check_command mpiifort "intelmpi" && MPIFC="$(command -v mpiifort)" || exit 1
     MPIF90="${MPIFC}"
     MPIF77="${MPIFC}"
     add_include_from_paths INTELMPI_CFLAGS "mpi.h" $INCLUDE_PATHS
@@ -59,9 +59,15 @@ case "${with_intelmpi}" in
     check_dir "${pkg_install_dir}/lib"
     check_dir "${pkg_install_dir}/include"
     check_command ${pkg_install_dir}/bin/mpirun "intel" && MPIRUN="${pkg_install_dir}/bin/mpirun" || exit 1
-    check_command ${pkg_install_dir}/bin/mpiicc "intel" && MPICC="${pkg_install_dir}/bin/mpiicc" || exit 1
-    check_command ${pkg_install_dir}/bin/mpiicpc "intel" && MPICXX="${pkg_install_dir}/bin/mpiicpc" || exit 1
-    check_command ${pkg_install_dir}/bin/mpiifort "intel" && MPIFC="${pkg_install_dir}/bin/mpiifort" || exit 1
+    if [ "${with_intel}" != "__DONTUSE__" ]; then
+      check_command ${pkg_install_dir}/bin/mpiicc "intel" && MPICC="${pkg_install_dir}/bin/mpiicc" || exit 1
+      check_command ${pkg_install_dir}/bin/mpiicpc "intel" && MPICXX="${pkg_install_dir}/bin/mpiicpc" || exit 1
+      check_command ${pkg_install_dir}/bin/mpiifort "intel" && MPIFC="${pkg_install_dir}/bin/mpiifort" || exit 1
+    else
+      check_command ${pkg_install_dir}/bin/mpicc "intel" && MPICC="${pkg_install_dir}/bin/mpicc" || exit 1
+      check_command ${pkg_install_dir}/bin/mpicxx "intel" && MPICXX="${pkg_install_dir}/bin/mpicxx" || exit 1
+      check_command ${pkg_install_dir}/bin/mpif90 "intel" && MPIFC="${pkg_install_dir}/bin/mpif90" || exit 1
+    fi
     MPIF90="${MPIFC}"
     MPIF77="${MPIFC}"
     INTELMPI_CFLAGS="-I'${pkg_install_dir}/include'"