Mercurial > octave
changeset 25492:7cdda3ad947f
fix .oct files link dependencies and options for --link-all-deps (bug #54168)
* configure.ac: If $link_all_deps is "yes", set OCT_LINK_DEPS to
"libinterp/liboctinterp.la liboctave/liboctave.la".
* config-module.awk: Set la file DEPENDENCES to $(OCT_LINK_DEPS).
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 25 Jun 2018 01:24:44 -0400 |
| parents | b3c68525ed82 |
| children | 3b5db971e091 |
| files | configure.ac libinterp/dldfcn/config-module.awk |
| diffstat | 2 files changed, 10 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Jun 21 12:42:11 2018 -0400 +++ b/configure.ac Mon Jun 25 01:24:44 2018 -0400 @@ -1,4 +1,4 @@ -dnl Process this file with autoconf to produce a configure script. +9dnl Process this file with autoconf to produce a configure script. dnl dnl Copyright (C) 1993-2018 John W. Eaton ### @@ -3124,13 +3124,9 @@ OCT_LINK_DEPS="" OCT_LINK_OPTS="$LDFLAGS" -case $host_os in - mingw* | msdosmsvc) - OCT_LINK_DEPS="libinterp/liboctinterp.la liboctave/liboctave.la" - ;; -esac - if test $link_all_deps = yes; then + OCT_LINK_DEPS="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" @@ -3139,9 +3135,12 @@ OCTAVE_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS" OCTAVE_LINK_OPTS="$LIBOCTINTERP_LINK_OPTS" - - OCT_LINK_DEPS="$OCT_LINK_DEPS $LIBOCTINTERP_LINK_DEPS" - OCT_LINK_OPTS="$OCT_LINK_OPTS $LIBOCTINTERP_LINK_OPTS" +else + case $host_os in + mingw* | msdosmsvc) + OCT_LINK_DEPS="libinterp/liboctinterp.la liboctave/liboctave.la" + ;; + esac fi AC_SUBST(LIBOCTINTERP_LINK_DEPS)
--- a/libinterp/dldfcn/config-module.awk Thu Jun 21 12:42:11 2018 -0400 +++ b/libinterp/dldfcn/config-module.awk Mon Jun 25 01:24:44 2018 -0400 @@ -84,7 +84,7 @@ basename, ldflags[i]); printf ("%%canon_reldir%%_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) %s\n", basename, libraries[i]); - printf ("%%canon_reldir%%_%s_la_DEPENDENCIES = $(DLD_LIBOCTINTERP_LIBADD)\n", + printf ("%%canon_reldir%%_%s_la_DEPENDENCIES = $(OCT_LINK_DEPS)\n", basename); }