Merge branch 'develop' into bugfix/gnu-container

buildscripts/libs/build_lapack.sh

@@ -49,7 +49,7 @@ url="https://github.com/Reference-LAPACK/lapack/archive/$tarball"
 
 # Add CMAKE_INSTALL_LIBDIR to make sure it will be installed under lib not lib64
 cmake -H. -Bbuild -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBDIR=lib \
-      -DCMAKE_Fortran_COMPILER=$SERIAL_FC -DCMAKE_Fortran_FLAGS=$FCFLAGS -DBUILD_SHARED_LIBS=ON
+      -DBUILD_SHARED_LIBS=ON -DCMAKE_Fortran_COMPILER=$SERIAL_FC -DCMAKE_Fortran_FLAGS=$FCFLAGS
 cd build
 VERBOSE=$MAKE_VERBOSE make -j${NTHREADS:-4}
 [[ $MAKE_CHECK =~ [yYtT] ]] && make check

buildscripts/libs/build_mpi.sh

@@ -33,7 +33,6 @@ export CXX=$SERIAL_CXX
 export FC=$SERIAL_FC
 
 export FFLAGS+=" -fPIC"
-[[ -n $FC_GFORTRAN_10 ]] && export FFLAGS+=" -fallow-argument-mismatch -fallow-invalid-boz"
 export CFLAGS+=" -fPIC"
 export CXXFLAGS+=" -fPIC"
 export FCFLAGS=${FFLAGS}
@@ -82,6 +81,14 @@ case "$name" in
        else
            extra_conf="--enable-fortran --enable-cxx"
        fi
+       # gfortran-10+ compatibility flags
+       if [[ -n $FC_GFORTRAN_10 ]]; then
+           # Use these flags to build MPICH itself, but don't add to WRAPPER_FCFLAGS
+           export MPICHLIB_FCFLAGS+=" -fallow-argument-mismatch -fallow-invalid-boz"
+           export MPICHLIB_FFLAGS=${MPICHLIB_FCFLAGS}
+           # Disable check for mismatched args flags in confdb/aclocal_f77.ac
+           export pac_cv_prog_f77_mismatched_args=yes
+       fi
        [[ -n $HWLOC_ROOT ]] && extra_conf+=" --with-hwloc-prefix=${HWLOC_ROOT}"
        ;;
     *       )