tools/toolchain: Use MPICC, MPICXX and MPIFC variables to build toolc…

…hain
cp2k · Mar 12, 2020 · d240586 · d240586
1 parent 304f5e8
commit d240586
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tools/toolchain/scripts/install_libvdwxc.sh b/tools/toolchain/scripts/install_libvdwxc.sh
@@ -73,7 +73,7 @@ case "$with_libvdwxc" in
                     --without-mpi \
                     >> configure.log 2>&1
             else
-                CC=mpicc FC=mpifort ./configure \
+                CC="${MPICC}" FC="${MPIFC}" ./configure \
                     --prefix="${pkg_install_dir}" \
                     --libdir="${pkg_install_dir}/lib" \
                     --with-fftw3=${FFTW_ROOT} \

diff --git a/tools/toolchain/scripts/install_sirius.sh b/tools/toolchain/scripts/install_sirius.sh
@@ -130,8 +130,8 @@ case "$with_sirius" in
             cmake -DCMAKE_INSTALL_PREFIX=${pkg_install_dir} \
                   -DCMAKE_CXXFLAGS_RELEASE="${SIRIUS_OPT}" \
                   -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="${SIRIUS_DBG}" \
-                  -DCMAKE_CXX_COMPILER=mpic++ \
-                  -DCMAKE_C_COMPILER=mpicc \
+                  -DCMAKE_CXX_COMPILER="${MPICXX}" \
+                  -DCMAKE_C_COMPILER="${MPICC}" \
                   ${COMPILATION_OPTIONS} .. > compile.log 2>&1
             make -j $NPROCS -C src >> compile.log 2>&1
 
@@ -154,8 +154,8 @@ case "$with_sirius" in
                       -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="${SIRIUS_DBG}" \
                       -DUSE_CUDA=ON \
                       -DGPU_MODEL=P100 \
-                      -DCMAKE_CXX_COMPILER=mpic++ \
-                      -DCMAKE_C_COMPILER=mpicc ${COMPILATION_OPTIONS} .. >> compile.log 2>&1
+                      -DCMAKE_CXX_COMPILER="${MPICXX}" \
+                      -DCMAKE_C_COMPILER="${MPICC}" ${COMPILATION_OPTIONS} .. >> compile.log 2>&1
                 make -j $NPROCS -C src >> compile.log 2>&1
                 install -d ${pkg_install_dir}/lib/cuda
                 install -d ${pkg_install_dir}/include/cuda