Changeset 27735


Ignore:
Timestamp:
05/09/23 21:40:07 (2 years ago)
Author:
jdquinn
Message:

BUG: Fix for @rpath not being set for libgfortran on newer versions of gcc on macOS

Location:
issm/trunk-jpl
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/m4/issm_options.m4

    r27638 r27735  
    24452445                        FORTRAN_DIR=$(echo ${FORTRAN_LIB} | sed -e "s/-L//g" | awk '{print $[1]}')
    24462446                        if test -d "${FORTRAN_DIR}" || test -f "${FORTRAN_DIR}"; then
     2447                                FORTRANDIR="${FORTRAN_DIR}"
    24472448                                FORTRANLIB="${FORTRAN_LIB}"
    24482449                                AC_DEFINE([_HAVE_FORTRAN_], [1], [with Fortran library in ISSM src])
     2450                                AC_SUBST([FORTRANDIR])
    24492451                                AC_SUBST([FORTRANLIB])
    24502452                        else

  • issm/trunk-jpl/src/c/Makefile.am

    r27709 r27735  
    775775AM_LDFLAGS += -static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN/../lib'
    776776endif
     777else
     778if MAC
     779AM_LDFLAGS += -Wl,-rpath,$(FORTRANDIR)
     780endif
    777781endif
    778782
Note: See TracChangeset for help on using the changeset viewer.