source: issm/oecreview/Archive/24684-25833/ISSM-24965-24966.diff

Last change on this file was 25834, checked in by Mathieu Morlighem, 4 years ago

CHG: added 24684-25833
File size: 1.6 KB
RevLine 
[25834]1Index: ../trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh
2===================================================================
3--- ../trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh (revision 24965)
4+++ ../trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh (revision 24966)
5@@ -9,7 +9,7 @@
6
7 ## Environment
8 #
9-LIBGFORTRAN=$(find /usr/local/Cellar -name libgfortran.a | head -n 1)
10+LIBGFORTRAN=$(find /usr/local/Cellar -name libgfortran.a | grep -v i386 | sed "s/1://")
11 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
12
13 export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lfblas ${LIBGFORTRAN_ROOT}/libgfortran.a ${LIBGFORTRAN_ROOT}/libquadmath.a ${LIBGFORTRAN_ROOT}/gcc/x86_64-apple-darwin15/9.3.0/libgcc.a" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
14Index: ../trunk-jpl/externalpackages/dakota/install-6.2-mac.sh
15===================================================================
16--- ../trunk-jpl/externalpackages/dakota/install-6.2-mac.sh (revision 24965)
17+++ ../trunk-jpl/externalpackages/dakota/install-6.2-mac.sh (revision 24966)
18@@ -9,7 +9,7 @@
19
20 ## Environment
21 #
22-LIBGFORTRAN=$(find /usr/local/Cellar -name libgfortran.* | head -n 1)
23+LIBGFORTRAN=$(find /usr/local/Cellar -name libgfortran.dylib | grep -v i386 | sed "s/1://")
24 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
25
26 export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/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
Note: See TracBrowser for help on using the repository browser.