Changeset 27804

Timestamp:

06/26/23 10:24:47 (21 months ago)

Author:

jdquinn

Message:

CHG: Updated install scripts to handle new Mac architectures

Location:

issm/trunk-jpl/externalpackages

Files:

• m1qn3/install.sh (modified) (3 diffs)
• semic/install.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/m1qn3/install.sh ¶

@@ -26 +26 @@
 patch src/src/m1qn3.f patch/m1qn3.f.patch
 
-if [ -z "${FC-}" ]; then
-        if which ifort >/dev/null; then
-                FC="ifort"
+if which ifort >/dev/null; then
+        FC="ifort"
+        FFLAGS="-traceback -check all" # -O2 is default 
+else
+        FC="gfortran"
+        if [ `uname` == "Darwin" ]; then
+                FFLAGS="-fcheck=all -arch $(uname -m)"
         else
-                FC="gfortran"
-                if [ `uname` == "Darwin" ]; then
-                        FC="gfortran -arch x86_64"
-                fi
+                FFLAGS=""
         fi
 fi
-echo "Using fortran compiler: $FC"
 
 # Compile and install
@@ -44 +44 @@
 LIB_EXT=a
 FC=$FC
+FFLAGS=$FFLAGS
 install: libm1qn3.\$(LIB_EXT)
         cp libm1qn3.\$(LIB_EXT) ${PREFIX}
@@ -63 +64 @@
 LIB_EXT=a
 FC=$FC
+FFLAGS=$FFLAGS
 install: libddot.\$(LIB_EXT)
         cp libddot.\$(LIB_EXT) ${PREFIX}

issm/trunk-jpl/externalpackages/semic/install.sh ¶

@@ -16 +16 @@
 if which ifort >/dev/null; then
         FC="ifort"
-        FFLAGS="-traceback -check all" #-O2 is default 
+        FFLAGS="-traceback -check all" # -O2 is default 
 else
         FC="gfortran"
         if [ `uname` == "Darwin" ]; then
-                FC="gfortran -arch x86_64"
-                FFLAGS="-fcheck=all"
+                FFLAGS="-fcheck=all -arch $(uname -m)"
         else
                 FFLAGS=""