Skip to content

Commit 44fa8d1

Browse files
CHG: Homebrew copy of gcc for older versions of gcc does not contain gfortran binary now
1 parent 72f57f1 commit 44fa8d1

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

jenkins/mac-intel-basic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ISSM_CONFIG='\
1111
--enable-debugging \
1212
--with-numthreads=4 \
1313
--with-matlab-dir=${MATLAB_PATH} \
14-
--with-fortran-lib="-L/usr/local/Cellar/gcc@13/13.3.0/lib/gcc/13 -lgfortran" \
14+
--with-fortran-lib="-L/usr/local/gfortran/lib -lgfortran" \
1515
--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
1616
--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
1717
--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \

jenkins/mac-intel-binaries-matlab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MATLAB_PATH="/Applications/MATLAB_R2023b.app"
2-
LIBGFORTRAN_PATH="/usr/local/Cellar/gcc@13/13.3.0/lib/gcc/13"
3-
LIBGCC_PATH="${LIBGFORTRAN_PATH}/gcc/x86_64-apple-darwin21/13"
2+
LIBGFORTRAN_PATH="/usr/local/gfortran/lib"
3+
LIBGCC_PATH="${LIBGFORTRAN_PATH}/gcc/x86_64-apple-darwin21/12.1.0"
44

55
#--------------------#
66
# ISSM Configuration #

jenkins/mac-intel-binaries-python-3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MATLAB_PATH="/Applications/MATLAB_R2023b.app"
2-
LIBGFORTRAN_PATH="/usr/local/Cellar/gcc@13/13.3.0/lib/gcc/13"
3-
LIBGCC_PATH="${LIBGFORTRAN_PATH}/gcc/x86_64-apple-darwin21/13"
2+
LIBGFORTRAN_PATH="/usr/local/gfortran/lib"
3+
LIBGCC_PATH="${LIBGFORTRAN_PATH}/gcc/x86_64-apple-darwin21/12.1.0"
44

55
#--------------------#
66
# ISSM Configuration #

jenkins/mac-intel-dakota

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ISSM_CONFIG='\
1717
--with-numthreads=4 \
1818
--with-matlab-dir=${MATLAB_PATH} \
1919
--with-python="${HOME}/.venv/issm/bin/python" \
20-
--with-fortran-lib="-L/usr/local/Cellar/gcc@13/13.3.0/lib/gcc/13 -lgfortran" \
20+
--with-fortran-lib="-L/usr/local/gfortran/lib -lgfortran" \
2121
--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
2222
--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
2323
--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \

jenkins/mac-intel-examples

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ISSM_CONFIG='\
1919
--enable-debugging \
2020
--with-numthreads=4 \
2121
--with-matlab-dir=${MATLAB_PATH} \
22-
--with-fortran-lib="-L/usr/local/Cellar/gcc@13/13.3.0/lib/gcc/13 -lgfortran" \
22+
--with-fortran-lib="-L/usr/local/gfortran/lib -lgfortran" \
2323
--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
2424
--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
2525
--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \

jenkins/mac-intel-full

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ISSM_CONFIG='\
2121
--with-numthreads=4 \
2222
--with-matlab-dir=${MATLAB_PATH} \
2323
--with-python="${HOME}/.venv/issm/bin/python" \
24-
--with-fortran-lib="-L/usr/local/Cellar/gcc@13/13.3.0/lib/gcc/13 -lgfortran" \
24+
--with-fortran-lib="-L/usr/local/gfortran/lib -lgfortran" \
2525
--with-mpi-include="${ISSM_DIR}/externalpackages/petsc/install/include" \
2626
--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
2727
--with-blas-lapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \

jenkins/mac-intel-solid_earth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ISSM_CONFIG='\
2020
--with-numthreads=4 \
2121
--with-matlab-dir=${MATLAB_PATH} \
2222
--with-python="${HOME}/.venv/issm/bin/python" \
23-
--with-fortran-lib="-L/usr/local/Cellar/gcc@13/13.3.0/lib/gcc/13 -lgfortran" \
23+
--with-fortran-lib="-L/usr/local/gfortran/lib -lgfortran" \
2424
--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
2525
--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
2626
--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \

0 commit comments

Comments
 (0)