Mercurial > jwe > octave
changeset 26366:16607f64eea1 stable
Include -loctave -loctinterp and lib path to mkoctfile link command (bug #55033).
* configure.ac: Set MKOCTFILE_OCT_LINK_DEPS to LIBOCTINTERP and LIBOCTAVE when
configured with --enable-link-all-dependencies.
* src/mkoctfile.in.cc (main): Include -L$OCTLIBDIR in DEFAULT_LFLAGS when
compiling for Mac.
| author | Ben Abbott <bpabbott@mac.com> |
|---|---|
| date | Wed, 02 Jan 2019 14:30:11 +0800 |
| parents | e3dfcfc8bd6c |
| children | 2398d2cc3d70 |
| files | configure.ac src/mkoctfile.in.cc |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Jan 02 08:22:52 2019 -0800 +++ b/configure.ac Wed Jan 02 14:30:11 2019 +0800 @@ -2759,7 +2759,7 @@ OCT_GUI_LINK_DEPS="libgui/liboctgui.la libinterp/liboctinterp.la liboctave/liboctave.la" MKOCTFILE_OCTAVE_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS $MKOCTFILE_LIBOCTAVE_LINK_DEPS" - MKOCTFILE_OCT_LINK_DEPS="$OCT_LINK_DEPS $MKOCTFILE_LIBOCTINTERP_LINK_DEPS" + MKOCTFILE_OCT_LINK_DEPS="$LIBOCTINTERP $LIBOCTAVE" LIBOCTINTERP_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS $LIBOCTAVE_LINK_DEPS" LIBOCTINTERP_LINK_OPTS="$LIBOCTINTERP_LINK_OPTS $LIBOCTAVE_LINK_OPTS"
--- a/src/mkoctfile.in.cc Wed Jan 02 08:22:52 2019 -0800 +++ b/src/mkoctfile.in.cc Wed Jan 02 14:30:11 2019 +0800 @@ -214,7 +214,7 @@ std::string DEFAULT_LFLAGS; -#if defined (OCTAVE_USE_WINDOWS_API) || defined (CROSS) +#if (defined (OCTAVE_USE_WINDOWS_API) || defined (CROSS)) || (defined __APPLE__ && defined __MACH__) // We'll be linking the files we compile with -loctinterp and // -loctave, so we need to know where to find them.