stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build system: no longer use deprecated LFLAGS from mkoctfile 

By the way, drop the -static-* flags from LDFLAGS in Windows mkoctfile stub. It
is no more needed and creates duplicates in the link command line (since those
flags are already in DL_LDFLAGS).
trustregion
Sébastien Villemot 2022-01-24 12:23:47 +01:00
parent f5f47cd834
commit 79132ebe55
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mex/build/octave/configure.ac
View File

@ -34,7 +34,7 @@ AR=$($MKOCTFILE -p AR)
RANLIB=$($MKOCTFILE -p RANLIB) RANLIB=$($MKOCTFILE -p RANLIB)
CFLAGS=$($MKOCTFILE -p CFLAGS) CFLAGS=$($MKOCTFILE -p CFLAGS)
CXXFLAGS=$($MKOCTFILE -p CXXFLAGS) CXXFLAGS=$($MKOCTFILE -p CXXFLAGS)
LDFLAGS="$($MKOCTFILE -p LFLAGS) $($MKOCTFILE -p LDFLAGS)" LDFLAGS=$($MKOCTFILE -p LDFLAGS)
AC_CANONICAL_HOST AC_CANONICAL_HOST

16
windows/deps/mkoctfile64
View File

@ -1,10 +1,8 @@
#! /bin/sh #! /bin/sh
## Make sure to keep -static-libgcc, -static-libstdc++ and -static-libgfortran in LDFLAGS and ## Make sure to keep -static-libgcc, -static-libstdc++ and -static-libgfortran
## DL_LDFLAGS when updating this file. ## in DL_LDFLAGS when updating this file.
## This is needed to cope for differences between the MinGW libraries shipped by the official Octave ## Also keep BINDIR in DEFAULT_LDFLAGS (for UMFPACK).
## package for Windows, and the MinGW libraries from Debian used on the runners.
## Also keep BINDIR in DEFAULT_LFLAGS (for UMFPACK)
# Exit immediately on any error. # Exit immediately on any error.
set -e set -e
@ -44,9 +42,9 @@ if [ "$INCLUDEDIR" != /usr/include ]; then
DEFAULT_INCFLAGS="$DEFAULT_INCFLAGS -I$INCLUDEDIR" DEFAULT_INCFLAGS="$DEFAULT_INCFLAGS -I$INCLUDEDIR"
fi fi
DEFAULT_LFLAGS="-L$OCTLIBDIR -L$BINDIR" DEFAULT_LDFLAGS="-L$OCTLIBDIR -L$BINDIR"
if [ "$LIBDIR" != /usr/lib ]; then if [ "$LIBDIR" != /usr/lib ]; then
DEFAULT_LFLAGS="$DEFAULT_LFLAGS -L$LIBDIR" DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -L$LIBDIR"
fi fi
# Default values for these variables are filled in when Octave is # Default values for these variables are filled in when Octave is
@ -90,9 +88,9 @@ fi
: ${LIBS="-lpsapi -lgdi32 -lm"} : ${LIBS="-lpsapi -lgdi32 -lm"}
: ${FLIBS="-lm -lgfortran -lmingw32 -lmoldname -lmingwex -lmsvcrt -lquadmath -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32"} : ${FLIBS="-lm -lgfortran -lmingw32 -lmoldname -lmingwex -lmsvcrt -lquadmath -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32"}
: ${LD_CXX="x86_64-w64-mingw32-g++"} : ${LD_CXX="x86_64-w64-mingw32-g++"}
: ${LDFLAGS="-static-libgcc -static-libstdc++ -static-libgfortran"} : ${LDFLAGS=$DEFAULT_LDFLAGS}
: ${LD_STATIC_FLAG=""} : ${LD_STATIC_FLAG=""}
: ${LFLAGS=$DEFAULT_LFLAGS} : ${LFLAGS=$DEFAULT_LDFLAGS}
: ${F77_INTEGER_8_FLAG=""} : ${F77_INTEGER_8_FLAG=""}
: ${ALL_FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"} : ${ALL_FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"}