Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh	(revision 27396)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh	(revision 27397)
@@ -13,8 +13,10 @@
 # TODO:
 # - Move this to etc/environment.sh
+# - Test if -static-libgfortran flag will avoid all of this.
+# - Otherwise, refactor this to work with other gfortran installations.
 #
-LIBGFORTRAN=$(find /usr -name libgfortran* | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
-LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
+LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
 
 ## Environment
Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh	(revision 27396)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh	(revision 27397)
@@ -9,11 +9,19 @@
 PREFIX="${ISSM_DIR}/externalpackages/dakota/install" # Set to location where external package should be installed
 
+# Find libgfortran so that we do not have to hardcode it.
+#
+# TODO:
+# - 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_ROOT=${LIBGFORTRAN%/*}
+
 ## Environment
 #
-export BLAS_LIBS="-L${BLAS_ROOT}/lib -lfblas -L/usr/lib/x86_64-linux-gnu -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
+export BLAS_LIBS="-L${BLAS_ROOT}/lib -lfblas -L${LIBGFORTRAN_ROOT} -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
 export DAK_BUILD=${ISSM_DIR}/externalpackages/dakota/build # DO NOT CHANGE THIS
 export DAK_INSTALL=${PREFIX} # DO NOT CHANGE THIS
 export DAK_SRC=${ISSM_DIR}/externalpackages/dakota/src # DO NOT CHANGE THIS
-export LAPACK_LIBS="-L${LAPACK_ROOT}/lib -lflapack -L/usr/lib/x86_64-linux-gnu -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
+export LAPACK_LIBS="-L${LAPACK_ROOT}/lib -lflapack -L${LIBGFORTRAN_ROOT} -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
 
 # Cleanup
Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh	(revision 27396)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh	(revision 27397)
@@ -9,17 +9,14 @@
 PREFIX="${ISSM_DIR}/externalpackages/dakota/install" # Set to location where external package should be installed
 
-# Find libgfortran and libgcc so we do not have to hardcode them.
-#
-# Should retrieve a copy of gfortran that is compiled from source before 
-# returning one that is installed via package manager.
+# Find libgfortran and libgcc so we do not have to hardcode them
 #
 # TODO:
 # - Move this to etc/environment.sh
-# - Test if -static-libgfortran flag will avoid all of this
-# - Otherwise, refactor this to work with other gfortran installations
+# - Test if -static-libgfortran flag will avoid all of this.
+# - Otherwise, refactor this to work with other gfortran installations.
 #
-LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
-LIBGCC=$(mdfind -onlyin ${LIBGFORTRAN_ROOT} -name libgcc | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
 
 ## Environment
Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-mac.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-mac.sh	(revision 27396)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-mac.sh	(revision 27397)
@@ -11,11 +11,8 @@
 # Find libgfortran so that we do not have to hardcode it.
 #
-# Should retrieve a copy of gfortran that is compiled from source before 
-# returning one that is installed via package manager.
-#
 # TODO:
 # - Move this to etc/environment.sh
 #
-LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
 
Index: /issm/trunk-jpl/externalpackages/gmsh/install-4-linux-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gmsh/install-4-linux-static.sh	(revision 27396)
+++ /issm/trunk-jpl/externalpackages/gmsh/install-4-linux-static.sh	(revision 27397)
@@ -24,7 +24,7 @@
 # - Move this to etc/environment.sh
 #
-LIBGFORTRAN=$(find /usr -name libgfortran* | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
-LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
+LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
 
 # Cleanup
Index: /issm/trunk-jpl/externalpackages/gmsh/install-4-linux.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gmsh/install-4-linux.sh	(revision 27396)
+++ /issm/trunk-jpl/externalpackages/gmsh/install-4-linux.sh	(revision 27397)
@@ -24,5 +24,5 @@
 # - Move this to etc/environment.sh
 #
-LIBGFORTRAN=$(find /usr -name libgfortran* | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
 
Index: /issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh	(revision 27396)
+++ /issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh	(revision 27397)
@@ -22,6 +22,4 @@
 # Find libgfortran and libgcc so we do not have to hardcode them
 #
-# Should retrieve a copy of gfortran that is compiled from source before returning one that is installed via package manager
-#
 # TODO:
 # - Move this to etc/environment.sh
@@ -29,7 +27,7 @@
 # - Otherwise, refactor this to work with other gfortran installations.
 #
-LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
-LIBGCC=$(mdfind -onlyin ${LIBGFORTRAN_ROOT} -name libgcc | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
 
 # Cleanup
Index: /issm/trunk-jpl/externalpackages/gmsh/install-4-mac.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gmsh/install-4-mac.sh	(revision 27396)
+++ /issm/trunk-jpl/externalpackages/gmsh/install-4-mac.sh	(revision 27397)
@@ -21,11 +21,8 @@
 # Find libgfortran so that we do not have to hardcode it.
 #
-# Should retrieve a copy of gfortran that is compiled from source before 
-# returning one that is installed via package manager.
-#
 # TODO:
 # - Move this to etc/environment.sh
 #
-LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
 
Index: /issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh	(revision 27396)
+++ /issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh	(revision 27397)
@@ -11,8 +11,10 @@
 # TODO:
 # - Move this to etc/environment.sh
+# - Test if -static-libgfortran flag will avoid all of this.
+# - Otherwise, refactor this to work with other gfortran installations.
 #
-LIBGFORTRAN=$(find /usr -name libgfortran* | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
-LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
+LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
 
 GDAL_EXTRA_LIBS="-lstdc++" # Determined by running `$GDAL_ROOT/bin/gdal-config --dep-libs` then removing duplicate libs
Index: /issm/trunk-jpl/externalpackages/gmt/install-6-linux.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gmt/install-6-linux.sh	(revision 27396)
+++ /issm/trunk-jpl/externalpackages/gmt/install-6-linux.sh	(revision 27397)
@@ -12,5 +12,5 @@
 # - Move this to etc/environment.sh
 #
-LIBGFORTRAN=$(find /usr -name libgfortran* | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
 
Index: /issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh	(revision 27396)
+++ /issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh	(revision 27397)
@@ -9,6 +9,4 @@
 # Find libgfortran and libgcc so we do not have to hardcode them
 #
-# Should retrieve a copy of gfortran that is compiled from source before returning one that is installed via package manager
-#
 # TODO:
 # - Move this to etc/environment.sh
@@ -16,7 +14,7 @@
 # - Otherwise, refactor this to work with other gfortran installations.
 #
-LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
-LIBGCC=$(mdfind -onlyin ${LIBGFORTRAN_ROOT} -name libgcc | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
 
 GDAL_EXTRA_LIBS="-lc++" # `$GDAL_ROOT/bin/gdal-config --dep-libs` does not report need to link to libc++ (see also customized configuration file ./configs/6/static/cmake/modules/FindGDAL.cmake)
Index: /issm/trunk-jpl/externalpackages/gmt/install-6-mac.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gmt/install-6-mac.sh	(revision 27396)
+++ /issm/trunk-jpl/externalpackages/gmt/install-6-mac.sh	(revision 27397)
@@ -9,11 +9,8 @@
 # Find libgfortran so that we do not have to hardcode it.
 #
-# Should retrieve a copy of gfortran that is compiled from source before 
-# returning one that is installed via package manager.
-#
 # TODO:
 # - Move this to etc/environment.sh
 #
-LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
 
Index: /issm/trunk-jpl/jenkins/eis-daskhub-python-modules
===================================================================
--- /issm/trunk-jpl/jenkins/eis-daskhub-python-modules	(revision 27397)
+++ /issm/trunk-jpl/jenkins/eis-daskhub-python-modules	(revision 27397)
@@ -0,0 +1,83 @@
+# NOTE: This configuration adds solid earth and Dakota capabilities to the 
+#		basic build.
+
+#--------------------#
+# ISSM Configuration #
+#--------------------#
+
+ISSM_CONFIG='\
+	--prefix="${ISSM_DIR}" \
+	--disable-static \
+	--enable-development \
+	--enable-debugging \
+	--with-numthreads=4 \
+	--with-python-dir="/srv/conda/envs/notebook" \
+	--with-python-version="3.9" \
+	--with-python-numpy-dir="/srv/conda/envs/notebook/lib/python3.9/site-packages/numpy/core/include/numpy" \
+	--with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
+	--with-mpi-include="${ISSM_EXT_DIR}/petsc/install/include" \
+	--with-mpi-libflags="-L${ISSM_EXT_DIR}/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-blas-lapack-dir="${ISSM_EXT_DIR}/petsc/install" \
+	--with-metis-dir="${ISSM_EXT_DIR}/petsc/install" \
+	--with-parmetis-dir="${ISSM_EXT_DIR}/petsc/install" \
+	--with-scalapack-dir="${ISSM_EXT_DIR}/petsc/install" \
+	--with-mumps-dir="${ISSM_EXT_DIR}/petsc/install" \
+	--with-hdf5-dir="${ISSM_EXT_DIR}/petsc/install" \
+	--with-petsc-dir="${ISSM_EXT_DIR}/petsc/install" \
+	--with-gsl-dir="${ISSM_EXT_DIR}/gsl/install" \
+	--with-boost-dir="${ISSM_EXT_DIR}/boost/install" \
+	--with-dakota-dir="${ISSM_EXT_DIR}/dakota/install" \
+	--with-proj-dir="${ISSM_EXT_DIR}/proj/install" \
+	--with-triangle-dir="${ISSM_EXT_DIR}/triangle/install" \
+	--with-chaco-dir="${ISSM_EXT_DIR}/chaco/install" \
+	--with-m1qn3-dir="${ISSM_EXT_DIR}/m1qn3/install" \
+	--with-semic-dir="${ISSM_EXT_DIR}/semic/install" \
+'
+
+#-------------------#
+# External Packages #
+#-------------------#
+
+EXTERNALPACKAGES="
+	autotools	install-linux.sh
+	cmake		install.sh
+	petsc		install-3.16-linux.sh
+	gsl			install.sh
+	boost		install-1.7-linux.sh
+	dakota		install-6.2-linux.sh
+	curl		install-7-linux.sh
+	netcdf		install-4.7-parallel.sh
+	proj		install-6.sh
+	gdal		install-3-python.sh
+	gshhg		install.sh
+	gmt			install-6-linux.sh
+	gmsh		install-4-linux.sh
+	triangle	install-linux.sh
+	chaco		install.sh
+	m1qn3		install.sh
+	semic		install.sh
+"
+
+#---------#
+# Testing #
+#---------#
+
+# Test suites
+MATLAB_TEST=0
+PYTHON_TEST=0
+JAVASCRIPT_TEST=0
+EXAMPLES_TEST=0
+
+# Number of CPUs used in ISSM compilation
+#
+# NOTE: One is usually safer as some packages are very sensitive to parallel
+# 		compilation
+#
+NUMCPUS_INSTALL=8
+
+# Number of CPUs used in the nightly runs
+NUMCPUS_RUN=1
+
+# Nightly run options
+MATLAB_NROPTIONS=""
+PYTHON_NROPTIONS=""
Index: sm/trunk-jpl/jenkins/eis-daskhub-python-nodules
===================================================================
--- /issm/trunk-jpl/jenkins/eis-daskhub-python-nodules	(revision 27396)
+++ 	(revision )
@@ -1,83 +1,0 @@
-# NOTE: This configuration adds solid earth and Dakota capabilities to the 
-#		basic build.
-
-#--------------------#
-# ISSM Configuration #
-#--------------------#
-
-ISSM_CONFIG='\
-	--prefix="${ISSM_DIR}" \
-	--disable-static \
-	--enable-development \
-	--enable-debugging \
-	--with-numthreads=4 \
-	--with-python-dir="/srv/conda/envs/notebook" \
-	--with-python-version="3.9" \
-	--with-python-numpy-dir="/srv/conda/envs/notebook/lib/python3.9/site-packages/numpy/core/include/numpy" \
-	--with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
-	--with-mpi-include="${ISSM_EXT_DIR}/petsc/install/include" \
-	--with-mpi-libflags="-L${ISSM_EXT_DIR}/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
-	--with-blas-lapack-dir="${ISSM_EXT_DIR}/petsc/install" \
-	--with-metis-dir="${ISSM_EXT_DIR}/petsc/install" \
-	--with-parmetis-dir="${ISSM_EXT_DIR}/petsc/install" \
-	--with-scalapack-dir="${ISSM_EXT_DIR}/petsc/install" \
-	--with-mumps-dir="${ISSM_EXT_DIR}/petsc/install" \
-	--with-hdf5-dir="${ISSM_EXT_DIR}/petsc/install" \
-	--with-petsc-dir="${ISSM_EXT_DIR}/petsc/install" \
-	--with-gsl-dir="${ISSM_EXT_DIR}/gsl/install" \
-	--with-boost-dir="${ISSM_EXT_DIR}/boost/install" \
-	--with-dakota-dir="${ISSM_EXT_DIR}/dakota/install" \
-	--with-proj-dir="${ISSM_EXT_DIR}/proj/install" \
-	--with-triangle-dir="${ISSM_EXT_DIR}/triangle/install" \
-	--with-chaco-dir="${ISSM_EXT_DIR}/chaco/install" \
-	--with-m1qn3-dir="${ISSM_EXT_DIR}/m1qn3/install" \
-	--with-semic-dir="${ISSM_EXT_DIR}/semic/install" \
-'
-
-#-------------------#
-# External Packages #
-#-------------------#
-
-EXTERNALPACKAGES="
-	autotools	install-linux.sh
-	cmake		install.sh
-	petsc		install-3.16-linux.sh
-	gsl			install.sh
-	boost		install-1.7-linux.sh
-	dakota		install-6.2-linux.sh
-	curl		install-7-linux.sh
-	netcdf		install-4.7-parallel.sh
-	proj		install-6.sh
-	gdal		install-3-python.sh
-	gshhg		install.sh
-	gmt			install-6-linux.sh
-	gmsh		install-4-linux.sh
-	triangle	install-linux.sh
-	chaco		install.sh
-	m1qn3		install.sh
-	semic		install.sh
-"
-
-#---------#
-# Testing #
-#---------#
-
-# Test suites
-MATLAB_TEST=0
-PYTHON_TEST=0
-JAVASCRIPT_TEST=0
-EXAMPLES_TEST=0
-
-# Number of CPUs used in ISSM compilation
-#
-# NOTE: One is usually safer as some packages are very sensitive to parallel
-# 		compilation
-#
-NUMCPUS_INSTALL=8
-
-# Number of CPUs used in the nightly runs
-NUMCPUS_RUN=1
-
-# Nightly run options
-MATLAB_NROPTIONS=""
-PYTHON_NROPTIONS=""
Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 27396)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 27397)
@@ -337,4 +337,10 @@
 		export CXXFLAGS="-std=C++11"
 	fi
+	dnl Fix for compact unwind warning
+	if test "${LDFLAGS}" == ""; then
+		LDFLAGS="-Wl,-no_compact_unwind"
+	else
+		LDFLAGS="${LDFLAGS} -Wl,-no_compact_unwind"
+	fi
 	AC_SUBST([OSLIBS])
 	AC_MSG_RESULT([done])