Changeset 27915

Timestamp:

09/20/23 13:39:50 (18 months ago)

Author:

jdquinn

Message:

CHG: Cleanup; fix for empty FORTRANDIR on macOS

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (3 diffs)
• src/c/Makefile.am (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -337 +337 @@
                         export CXXFLAGS="-D_MSYS2_"
                         export LDFLAGS="${LDFLAGS} -no-undefined"
-                        export OSLIBS="-Wl,-L/mingw64/lib/gcc/x86_64-w64-mingw32/10.2.0 -Wl,-L/mingw64/x86_64-w64-mingw32/lib -Wl,-lstdc++ -Wl,-lgfortran -Wl,-lmingw32 -Wl,-lgcc_s -Wl,-lmoldname -Wl,-lmingwex -Wl,-lmsvcrt -Wl,-lm -Wl,-lpthread -Wl,-lshell32 -Wl,-luser32 -Wl,-lgdi32 -Wl,-luser32 -Wl,-ladvapi32 -Wl,-lkernel32 -Wl,-lquadmath -Wl,-lstdc++ -Wl,-lgcc"
+                        export OSLIBS="-Wl,-L/c/msys64/mingw64/lib -Wl,-lstdc++ -Wl,-lmingw32 -Wl,-lgcc_s -Wl,-lmoldname -Wl,-lmingwex -Wl,-lmsvcrt -Wl,-lm -Wl,-lpthread -Wl,-lshell32 -Wl,-luser32 -Wl,-lgdi32 -Wl,-luser32 -Wl,-ladvapi32 -Wl,-lkernel32 -Wl,-lgcc"
                         IS_MSYS2=yes
                 else
@@ -1646 +1646 @@
                                         PARMETISLIB="-Wl,${PARMETIS_ROOT}/lib/libparmetis.a"
                                 ;;
-                                *msys*)
-                                        PARMETISLIB="-L${PARMETIS_ROOT}/lib -lparmetis"
-                                ;;
                         esac
                 #else
@@ -2448 +2445 @@
                 )
                 if test -n "${FORTRAN_LIB}"; then
-                        FORTRAN_DIR=$(echo ${FORTRAN_LIB} | sed -e "s/-L//g" | awk '{print $[1]}')
+                        FORTRAN_DIR=$(echo ${FORTRAN_LIB} | sed -e "s/-Wl,//g" | sed -e "s/-L//g" | awk '{print $[1]}')
                         if test -d "${FORTRAN_DIR}" || test -f "${FORTRAN_DIR}"; then
                                 FORTRANDIR="${FORTRAN_DIR}"
+                                if test -n "${FORTRAN_DIR}"; then
+                                        HAVEFORTRANDIR=yes
+                                else
+                                        HAVEFORTRANDIR=no
+                                fi
                                 FORTRANLIB="${FORTRAN_LIB}"
                                 AC_DEFINE([_HAVE_FORTRAN_], [1], [with Fortran library in ISSM src])
+                                AC_SUBST([HAVEFORTRANDIR])
+                                FORTRANLIB="${FORTRAN_LIB}"
+                                AC_DEFINE([_HAVE_FORTRAN_], [1], [with Fortran library in ISSM src])
+                                AC_SUBST([HAVEFORTRANDIR])
                                 AC_SUBST([FORTRANDIR])
                                 AC_SUBST([FORTRANLIB])

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

@@ -771 +771 @@
 else
 if MAC
-if $(FORTRANDIR) != ""
+if HAVEFORTRANDIR
 AM_LDFLAGS += -Wl,-rpath,$(FORTRANDIR)
 endif