Merge pull request #680 from sourceryinstitute/fix-#679

fix #679: set FFLAGS for mpich configure with GCC >= 10

Author: Damian Rouson

prerequisites/build-functions/build_and_install.sh

@@ -21,23 +21,32 @@ build_and_install()
   fi
   mkdir -p "${build_path}"
   info "pushd ${build_path}"
-  pushd "${build_path}"
+  pushd "${build_path}" || emergency "build_and_install.sh: pushd failed"
 
   if [[ "${package_to_build}" != "gcc" ]]; then
 
-    if [[ "${package_to_build}" == "mpich" && "${version_to_build}" == "3.2" ]]; then
-      info "Patching MPICH 3.2 on Mac OS due to segfault bug (see http://lists.mpich.org/pipermail/discuss/2016-May/004764.html)."
-      sed 's/} MPID_Request ATTRIBUTE((__aligned__(32)));/} ATTRIBUTE((__aligned__(32))) MPID_Request;/g' \
-        "${download_path}/${package_source_directory}/src/include/mpiimpl.h" > "${download_path}/${package_source_directory}/src/include/mpiimpl.h.patched"
-      cp "${download_path}/${package_source_directory}/src/include/mpiimpl.h.patched" "${download_path}/${package_source_directory}/src/include/mpiimpl.h"
+    if [[ "${package_to_build}" == "mpich" ]]; then
+      if [[ "${version_to_build}" == "3.2" ]]; then
+        info "Patching MPICH 3.2 on Mac OS due to segfault bug (see http://lists.mpich.org/pipermail/discuss/2016-May/004764.html)."
+        sed 's/} MPID_Request ATTRIBUTE((__aligned__(32)));/} ATTRIBUTE((__aligned__(32))) MPID_Request;/g' \
+          "${download_path}/${package_source_directory}/src/include/mpiimpl.h" > "${download_path}/${package_source_directory}/src/include/mpiimpl.h.patched"
+        cp "${download_path}/${package_source_directory}/src/include/mpiimpl.h.patched" "${download_path}/${package_source_directory}/src/include/mpiimpl.h"
+      fi
+
+      FC_version=$($FC --version)
+      text_before_dot="${FC_version%%.*}" # grab text before first dot
+      major_version="${text_before_dot##* }" # grab text after final space
+      if (( ${major_version} >= 10 )); then
+       export FFLAGS="-w -fallow-argument-mismatch"
+      fi
     fi
 
     if [[ "${package_to_build}" == "cmake"  && $(uname) == "Linux" ]]; then
 
       export cmake_binary_installer="${download_path}/cmake-${version_to_build}-Linux-x86_64.sh"
       ${SUDO:-} mkdir -p "$install_path"
       chmod u+x "${cmake_binary_installer}"
-      if [[ ! -z "${SUDO:-}" ]]; then
+      if [[ -n "${SUDO:-}" ]]; then
         info "You do not have write permissions to the installation path ${install_path}"
         info "If you have administrative privileges, enter your password to install ${package_to_build}"
       fi
@@ -48,13 +57,13 @@ build_and_install()
     else # build from source
 
       info "Configuring ${package_to_build} ${version_to_build} with the following command:"
-      info "FC=\"${FC:-'gfortran'}\" CC=\"${CC:-'gcc'}\" CXX=\"${CXX:-'g++'}\" \"${download_path}/${package_source_directory}\"/configure --prefix=\"${install_path}\""
-      FC="${FC:-'gfortran'}" CC="${CC:-'gcc'}" CXX="${CXX:-'g++'}" "${download_path}/${package_source_directory}"/configure --prefix="${install_path}"
+      info "FFLAGS=${FFLAGS:-} FC=\"${FC:-'gfortran'}\" CC=\"${CC:-'gcc'}\" CXX=\"${CXX:-'g++'}\" \"${download_path}/${package_source_directory}\"/configure --prefix=\"${install_path}\""
+      FFLAGS=${FFLAGS:-} FC="${FC:-'gfortran'}" CC="${CC:-'gcc'}" CXX="${CXX:-'g++'}" "${download_path}/${package_source_directory}"/configure --prefix="${install_path}"
       info "Building with the following command:"
       info "FC=\"${FC:-'gfortran'}\" CC=\"${CC:-'gcc'}\" CXX=\"${CXX:-'g++'}\" make -j\"${num_threads}\""
       FC="${FC:-'gfortran'}" CC="${CC:-'gcc'}" CXX="${CXX:-'g++'}" make "-j${num_threads}"
       info "Installing ${package_to_build} in ${install_path}"
-      if [[ ! -z "${SUDO:-}" ]]; then
+      if [[ -n "${SUDO:-}" ]]; then
         info "You do not have write permissions to the installation path ${install_path}"
         info "If you have administrative privileges, enter your password to install ${package_to_build}"
       fi
@@ -66,7 +75,7 @@ build_and_install()
   elif [[ ${package_to_build} == "gcc" ]]; then
 
     info "pushd ${download_path}/${package_source_directory} "
-    pushd "${download_path}/${package_source_directory}"
+    pushd "${download_path}/${package_source_directory}" || emergency "build_and_install.sh: pushd failed"
 
     # Patch gfortran if necessary
     export patches_dir="${OPENCOARRAYS_SRC_DIR}/prerequisites/build-functions/patches/${package_to_build}/${version_to_build}"
@@ -87,13 +96,13 @@ build_and_install()
     "${PWD}"/contrib/download_prerequisites
 
     info "popd"
-    popd
+    popd || emergency "build_and_install.sh: popd failed"
     info "Configuring gcc/g++/gfortran builds with the following command:"
     info "${download_path}/${package_source_directory}/configure --prefix=${install_path} --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror ${bootstrap_configure}"
-    "${download_path}/${package_source_directory}/configure" --prefix="${install_path}" --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror ${bootstrap_configure}
-    info "Building with the following command: 'make -j${num_threads} ${bootstrap_build}'"
-    make "-j${num_threads}" ${bootstrap_build}
-    if [[ ! -z "${SUDO:-}" ]]; then
+    "${download_path}/${package_source_directory}/configure" --prefix="${install_path}" --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror "${bootstrap_configure}"
+    info "Building with the following command: make -j ${num_threads} ${bootstrap_build}"
+    make -j ${num_threads} ${bootstrap_build:-}
+    if [[ -n "${SUDO:-}" ]]; then
       info "You do not have write permissions to the installation path ${install_path}"
       info "If you have administrative privileges, enter your password to install ${package_to_build}"
     fi
@@ -106,5 +115,5 @@ build_and_install()
 
 
   info "popd"
-  popd
+  popd || emergency "build_and_install.sh: popd failed"
 }