From 7813fb6fd85b4df6529dd6a6155b3a2a8a17266b Mon Sep 17 00:00:00 2001
From: edoapra <edoardo.apra@gmail.com>
Date: Tue, 1 Aug 2023 14:53:20 -0700
Subject: [PATCH] GFORTRAN_MARCH to set -march value (e.g.
 GFORTRAN_MARCH=znver3 sets -march=znver3)

---
 src/config/check_env.sh |  6 ++++--
 src/config/makefile.h   | 12 +++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/config/check_env.sh b/src/config/check_env.sh
index ee2f8d5780..8069c66040 100755
--- a/src/config/check_env.sh
+++ b/src/config/check_env.sh
@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
-if [[ -z $1 ]]; then
+if [[ ! -z $GFORTRAN_MARCH ]] ; then
+    exit=0
+elif [[ -z $1 ]]; then
     #undefined
     exit=1
-elif [[ $1 == "N" ]] || [[ $1 == "n" ]] || [[ $1 == "0" ]] ; then
+elif [[ $1 == "N" ]] || [[ $1 == "n" ]] || [[ $1 == "0" ]] || [[ ! -z $GFORTRAN_MARCH ]] ; then
     exit=0
 else
     exit=1
diff --git a/src/config/makefile.h b/src/config/makefile.h
index 9e79a70cb0..b0d86b9e85 100644
--- a/src/config/makefile.h
+++ b/src/config/makefile.h
@@ -2543,7 +2543,7 @@ ifneq ($(TARGET),LINUX)
 #                       FOPTIMIZE += -xHost
                         ifndef USE_IFX
 #                           crazy simd options
-                            ifeq ($(shell $(CNFDIR)/check_env.sh $(USE_HWOPT)),1)
+#                            ifeq ($(shell $(CNFDIR)/check_env.sh $(USE_HWOPT)),1)
                                 ifeq ($(_IFCV17), Y)
                                     ifeq ($(_GOTAVX512F),Y)
                                         FOPTIMIZE += -axCORE-AVX512
@@ -2556,7 +2556,7 @@ ifneq ($(TARGET),LINUX)
                                     else ifeq ($(_GOTSSE3),Y) 
                                         FOPTIMIZE += -axSSE3
                                     endif
-                                endif
+#                                endif
                             endif
                             FOPTIONS += -finline-limit=250
                         endif
@@ -2755,6 +2755,9 @@ ifneq ($(TARGET),LINUX)
                 ifeq ($(shell $(CNFDIR)/check_env.sh $(USE_HWOPT)),1)
                     FOPTIMIZE +=  -mtune=native
                 endif
+                ifdef GFORTRAN_MARCH
+                    FOPTIMIZE += -march=$(GFORTRAN_MARCH)
+                endif
 #               causes slowdows in mp2/ccsd
 #               FOPTIONS += -finline-functions
             endif
@@ -3099,7 +3102,6 @@ ifneq ($(TARGET),LINUX)
 #                DEFINES +=-DUSE_F90_ALLOCATABLE -DUSE_OMP_TEAMS_DISTRIBUTE
             endif
         endif
-		
 
         ifeq ($(NWCHEM_TARGET),CATAMOUNT)
             DEFINES  += -DCATAMOUNT
@@ -3585,10 +3587,10 @@ ifdef USE_MPI
                 endif
                 ifdef MPI_LIB
                     $(info ***warning MPI_LIB ignored since FORCE_MPI_ENV not set***)
- 	        endif
+                endif
                 ifdef MPI_INCLUDE
                     $(info ***warning MPI_INCLUDE ignored since FORCE_MPI_ENV not set***)
- 	        endif
+                endif
 	    endif
 	endif
         # check if mpif90 is present