From 4bf25d8fce6c240a5e6c9aff0dc9cc53d9a714dd Mon Sep 17 00:00:00 2001
From: Matthias Krack <matthias.krack@psi.ch>
Date: Fri, 3 Mar 2023 14:12:17 +0100
Subject: [PATCH] Print more variable settings during Intel toolchain build

---
 tools/toolchain/scripts/stage0/install_intel.sh    | 3 +++
 tools/toolchain/scripts/stage1/install_intelmpi.sh | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/tools/toolchain/scripts/stage0/install_intel.sh b/tools/toolchain/scripts/stage0/install_intel.sh
index c20bfea398..5dfcb7bc4c 100755
--- a/tools/toolchain/scripts/stage0/install_intel.sh
+++ b/tools/toolchain/scripts/stage0/install_intel.sh
@@ -53,6 +53,9 @@ case "${with_intel}" in
     ;;
 esac
 if [ "${with_intel}" != "__DONTUSE__" ]; then
+  echo "CC  is ${CC}"
+  echo "CXX is ${CXX}"
+  echo "FC  is ${FC}"
   cat << EOF > "${BUILDDIR}/setup_intel"
 export CC="${CC}"
 export CXX="${CXX}"
diff --git a/tools/toolchain/scripts/stage1/install_intelmpi.sh b/tools/toolchain/scripts/stage1/install_intelmpi.sh
index c0cbd7cf9e..aab5863271 100755
--- a/tools/toolchain/scripts/stage1/install_intelmpi.sh
+++ b/tools/toolchain/scripts/stage1/install_intelmpi.sh
@@ -75,6 +75,11 @@ if [ "${with_intelmpi}" != "__DONTUSE__" ]; then
   I_MPI_CC="icc"
   I_MPI_FC="ifort"
   INTELMPI_LIBS="-lmpi -lmpicxx"
+  echo "I_MPI_CC is ${I_MPI_CC}"
+  echo "I_MPI_FC is ${I_MPI_FC}"
+  echo "MPICC    is ${MPICC}"
+  echo "MPICXX   is ${MPICXX}"
+  echo "MPICXX   is ${MPIFC}"
   cat << EOF > "${BUILDDIR}/setup_intelmpi"
 export I_MPI_CC="${I_MPI_CC}"
 export I_MPI_FC="${I_MPI_FC}"