Skip to content

fix(installer): handle mpifort invoking f95 #724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2020
Merged

fix(installer): handle mpifort invoking f95 #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion prerequisites/install-functions/build_opencoarrays.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 1 addition & 5 deletions prerequisites/install-functions/report_results.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*}"
Expand Down