From af4a646fa0755cb6b050ee7baad3fb723d8816aa Mon Sep 17 00:00:00 2001
From: edoapra <edoardo.apra@gmail.com>
Date: Thu, 12 Feb 2026 15:51:09 -0800
Subject: [PATCH] nvfortran & nvc updates

---
 src/libext/elpa/build_elpa.sh         | 10 +++++++---
 src/libext/scalapack/build_scalapa.sh |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/libext/elpa/build_elpa.sh b/src/libext/elpa/build_elpa.sh
index 3c5c59c724..84c2f2f5cb 100755
--- a/src/libext/elpa/build_elpa.sh
+++ b/src/libext/elpa/build_elpa.sh
@@ -45,8 +45,6 @@ UNAME_S=$(uname -s)
 if [[ ${UNAME_S} == Linux ]]; then
     export ARFLAGS=rU
 fi
-MYCFLAGS+=" -Wno-error=implicit-function-declaration "
-MYCFLAGS+=" -Wno-error=format "
 if [[ ${UNAME_S} == Darwin ]]; then
     MYLINK+=" -Wl,-no_compact_unwind"
 if [[  -z "$HOMEBREW_PREFIX" ]]; then
@@ -83,6 +81,12 @@ else
 #	CFLAGS+="-I`${NWCHEM_TOP}/src/tools/guess-mpidefs --mpi_include`"
     fi
 fi
+GOTNVC=$( "$MPICC" -dM -E - </dev/null 2> /dev/null |grep __NVCOMPILER\  |cut -d " " -f 3)
+echo GOTNVC $GOTNVC
+if [[ ${GOTNVC} != 1 ]]; then
+    MYCFLAGS+=" -Wno-error=implicit-function-declaration "
+    MYCFLAGS+=" -Wno-error=format "
+fi
 if [[  -z "${FC}" ]]; then
     if [[ ! -z ${PE_ENV} ]]; then
 	FC=ftn
@@ -222,7 +226,7 @@ fi
 if [[ ${CC} == ifort ]] ; then
     MYFCFLAGS+=" -O3 -xhost "
 elif [[ ${FC} == nvfortran ]]  || [[ ${PE_ENV} == NVIDIA ]] ; then
-    MYCFLAGS+=" -tp native"
+    MYFCFLAGS+=" -tp native"
 elif [[ ${FC_EXTRA} == gfortran ]] ; then
     MYFCFLAGS+=" -O3 -g -mtune=native -march=native "
 #    MYFCFLAGS+=" -Wno-lto-type-mismatch "
diff --git a/src/libext/scalapack/build_scalapa.sh b/src/libext/scalapack/build_scalapa.sh
index b11299c4e1..b917f12901 100755
--- a/src/libext/scalapack/build_scalapa.sh
+++ b/src/libext/scalapack/build_scalapa.sh
@@ -277,10 +277,13 @@ 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)
+GOTNVC=$( "$MPICC" -dM -E - </dev/null 2> /dev/null |grep __NVCOMPILER\  |cut -d " " -f 3)
 if [[ `${MPICC} -dM -E - < /dev/null 2> /dev/null | grep -c GNU` > 0 ]] ; then
+    if [[ ${GOTNVC} != 1 ]]; then
     let GCCVERSIONGT12=$(expr `${MPICC} -dumpversion | cut -f1 -d.` \> 12)
     let GCCVERSIONGT13=$(expr `${MPICC} -dumpversion | cut -f1 -d.` \> 13)
     let GCCVERSIONGT14=$(expr `${MPICC} -dumpversion | cut -f1 -d.` \> 14)
+    fi
 fi
 
 if [[ ${GOTCLANG} == "1" ]] || [[ ${GCCVERSIONGT12} == "1" ]]  ; then