Changeset 27400

Timestamp:

11/21/22 01:09:29 (2 years ago)

Author:

jdquinn

Message:

BUG: Need to exclude i386 directory when discovering libgfortran on Pine Island

Location:

issm/trunk-jpl/externalpackages/dakota

Files:

• install-6.2-mac-static.sh (modified) (1 diff)
• install-6.2-mac.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh ¶

@@ -16 +16 @@
 # - Otherwise, refactor this to work with other gfortran installations.
 #
-LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
-LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
+LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
 
 ## Environment

issm/trunk-jpl/externalpackages/dakota/install-6.2-mac.sh ¶

@@ -14 +14 @@
 # - Move this to etc/environment.sh
 #
-LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}