build_opencoarrays.sh sets MPI-wrapped FC/CC value

Author: Damian Rouson

prerequisites/install-functions/build_opencoarrays.sh

@@ -10,18 +10,27 @@ build_opencoarrays()
   build_path="${build_path}"/opencoarrays/$("${opencoarrays_src_dir}"/install.sh -V opencoarrays)
   mkdir -p "$build_path"
   pushd "$build_path"
-  if [[ -z "${MPICC:-}" || -z "${MPIFC:-}" || -z "${CMAKE:-}" || -z "${FC:-}" || -z "${CC:-}" ]]; then
-    emergency "Empty MPICC=$MPICC or MPIFC=$MPIFC or FC or CC or CMAKE=$CMAKE [exit 90]"
-  else
-    info "Configuring OpenCoarrays in ${PWD} with the command:"
-    info "CC=\"${CC}\" FC=\"${FC}\" $CMAKE \"${opencoarrays_src_dir}\" -DCMAKE_INSTALL_PREFIX=\"${install_path}\" -DMPI_C_COMPILER=\"${MPICC}\" -DMPI_Fortran_COMPILER=\"${MPIFC}\""
-    CC="${CC}" FC="${FC}" $CMAKE "${opencoarrays_src_dir}" -DCMAKE_INSTALL_PREFIX="${install_path}" -DMPI_C_COMPILER="${MPICC}" -DMPI_Fortran_COMPILER="${MPIFC}"
-    info "Building OpenCoarrays in ${PWD} with the command make -j${num_threads}"
-    make "-j${num_threads}"
-    if [[ ! -z ${SUDO:-} ]]; then
-      printf "\nThe chosen installation path requires sudo privileges. Please enter password if prompted.\n"
-    fi
-    info "Installing OpenCoarrays in ${install_path} with the command ${SUDO:-} make install"
-    ${SUDO:-} make install
+  if [[ -z ${MPIFC:-} || -z ${MPICC:-} ]]; then
+    emergency "build_opencoarrays.sh: empty \${MPIFC}=${MPIFC:-} or \${MPICC}=${MPICC:-}"
   fi
+  MPIFC_show=`$MPIFC -show`
+  MPICC_show=`$MPICC -show`
+  if [[ ${MPIFC_show} != *gfortran* || ${MPICC_show} != *gcc* ]]; then
+    emergency "build_opencoarrays.sh: MPI doesn't wrap gfortran/gcc: \${MPIFC_show}=${MPIFC_show}, \${MPICC_show}=${MPICC_show}"
+  fi 
+  # Set FC to the MPI implementation's gfortran command with any preceding path but without any subsequent arguments:
+  FC="${MPIFC_show%%gfortran*}"gfortran
+  # Set CC to the MPI implementation's gcc command...
+  CC="${MPICC_show%%gcc*}"gcc
+  info "Configuring OpenCoarrays in ${PWD} with the command:"
+  info "CC=\"${CC}\" FC=\"${FC}\" $CMAKE \"${opencoarrays_src_dir}\" -DCMAKE_INSTALL_PREFIX=\"${install_path}\" -DMPI_C_COMPILER=\"${MPICC}\" -DMPI_Fortran_COMPILER=\"${MPIFC}\""
+  CC="${CC}" FC="${FC}" $CMAKE "${opencoarrays_src_dir}" -DCMAKE_INSTALL_PREFIX="${install_path}" -DMPI_C_COMPILER="${MPICC}" -DMPI_Fortran_COMPILER="${MPIFC}"
+  info "Building OpenCoarrays in ${PWD} with the command make -j${num_threads}"
+  make "-j${num_threads}"
+  if [[ ! -z ${SUDO:-} ]]; then
+    printf "\nThe chosen installation path requires sudo privileges. Please enter password if prompted.\n"
+  fi
+  info "Installing OpenCoarrays in ${install_path} with the command ${SUDO:-} make install"
+  ${SUDO:-} make install
 }
+