From de2e98d62d54e658e70e1f7bbac401f34d8c8bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= <ole.schuett@cp2k.org>
Date: Tue, 11 Jan 2022 00:34:03 +0100
Subject: [PATCH] Toolchain: Use MPI compiler wrappers also for C and C++

---
 tools/toolchain/scripts/generate_arch_files.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/toolchain/scripts/generate_arch_files.sh b/tools/toolchain/scripts/generate_arch_files.sh
index 0c0f989500..59fc295a2e 100755
--- a/tools/toolchain/scripts/generate_arch_files.sh
+++ b/tools/toolchain/scripts/generate_arch_files.sh
@@ -30,8 +30,8 @@ cd ${INSTALLDIR}/arch
 
 # need to switch between FC and MPICC etc in arch file, but cannot use
 # same variable names, so use _arch suffix
-CC_arch="$CC"
-CXX_arch="$CXX"
+CC_arch="IF_MPI(${MPICC}|${CC})"
+CXX_arch="IF_MPI(${MPICXX}|${CXX})"
 FC_arch="IF_MPI(${MPIFC}|${FC})"
 LD_arch="IF_MPI(${MPIFC}|${FC})"