Merge pull request #966 from edoapra/make44

updates
nwchemgit · Apr 28, 2024 · 3804d4c · 3804d4c
2 parents 183bcec + edfd7e0
commit 3804d4c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml
@@ -259,7 +259,7 @@ jobs:
             mpi_impl: openmpi
             armci_network: MPI-TS
             nwchem_modules: "tinyqmpw"
-            fc: gfortran-10
+            fc: gfortran-12
             cc: gcc
             use_libxc: 1
           - os: macos-14
@@ -329,10 +329,10 @@ jobs:
             mpi_impl: openmpi
             armci_network: MPI-TS
             nwchem_modules: "tinyqmpw"
-            fc: gfortran-9
+            fc: gfortran-13
             blas: "accelerate"
             blas_size: 4
-          - os: macos-latest
+          - os: macos-13
             experimental: true
             mpi_impl: mpich
             armci_network: MPI-PT

diff --git a/src/libext/scalapack/build_scalapa.sh b/src/libext/scalapack/build_scalapa.sh
@@ -233,7 +233,11 @@ if [[  -z "$PE_ENV"   ]] ; then
 fi
 #fix for clang 12 error in implicit-function-declaration
 GOTCLANG=$( "$MPICC" -dM -E - </dev/null 2> /dev/null |grep __clang__|head -1|cut -c19)
-if [[ ${GOTCLANG} == "1" ]] ; then
+if [[ `${MPICC} -dM -E - < /dev/null 2> /dev/null | grep -c GNU` > 0 ]] ; then
+    let GCCVERSIONGT12=$(expr `${MPICC} -dumpversion | cut -f1 -d.` \> 12)
+fi
+
+if [[ ${GOTCLANG} == "1" ]] || [[ ${GCCVERSIONGT12} == "1" ]]  ; then
     C_FLAGS=" -Wno-error=implicit-function-declaration "
 fi
 if [[  "$SCALAPACK_SIZE" == 8 ]] ; then