Merge pull request #724 from sourceryinstitute/update-installer

fix(installer): handle mpifort invoking f95

Author: Damian Rouson

prerequisites/install-functions/build_opencoarrays.sh

@@ -19,7 +19,10 @@ build_opencoarrays()
   MPIFC_show=($("$MPIFC" -show))
   MPICC_show=($("$MPICC" -show))
   if [[ "${MPIFC_show[0]}" != *gfortran* ]]; then
-    emergency "build_opencoarrays.sh: MPI doesn't wrap gfortran/gcc: \${MPIFC_show}=${MPIFC_show[*]}"
+    export fortran_compiler_identity="$(${MPIFC_show[0]} --version)"
+    if [[ $fortran_compiler_identity != "GNU Fortran"* ]]; then
+      emergency "build_opencoarrays.sh: MPI doesn't wrap gfortran/gcc: \${MPIFC_show}=${MPIFC_show[*]}"
+    fi
   fi
   if [[ -z "${OPENCOARRAYS_DEVELOPER:-}" ]]; then
       # We should examine the value too, but CMake has many ways of saying "true"

prerequisites/install-functions/report_results.sh

@@ -2,11 +2,7 @@
 report_results()
 {
   fully_qualified_FC="$(type -P "${FC}")"
-  if [[ ${fully_qualified_FC} != *gfortran* ]]; then
-    emergency "report_results.sh: non-gfortran compiler: \${fully_qualified_FC}=${fully_qualified_FC}"
-  fi
-  # Set path_to_FC fully-qualified gfortran location
-  compiler_install_root="${fully_qualified_FC%bin/gfortran*}"
+  compiler_install_root="${fully_qualified_FC%bin/${FC}}"
 
   fully_qualified_MPIFC="$(type -P "${MPIFC}")"
   mpi_install_root="${fully_qualified_MPIFC%bin/mpifort*}"