Mercurial > octave-libtiff

changeset 22006:f1136cf44edc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix linking of DLD functions with static build * libinterp/module.mk (LIBINTERP_DLDFCN_LIBADD): New variable. (libinterp_libinterp_la_LIBADD): Use it.
author John W. Eaton <jwe@octave.org>
date Thu, 30 Jun 2016 13:49:16 -0400
parents f078dd2c6f27
children 0e31c85c3969
files libinterp/module.mk
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/module.mk	Thu Jun 30 10:08:48 2016 -0700
+++ b/libinterp/module.mk	Thu Jun 30 13:49:16 2016 -0400
@@ -135,9 +135,11 @@
 if AMCOND_ENABLE_DYNAMIC_LINKING
   OCT_FILES = $(DLDFCN_LIBS:.la=.oct)
   DLD_LIBOCTINTERP_LIBADD = libinterp/liboctinterp.la
+  LIBINTERP_DLDFCN_LIBADD =
 else
   OCT_FILES =
   DLD_LIBOCTINTERP_LIBADD =
+  LIBINTERP_DLDFCN_LIBADD = $(DLDFCN_LIBS)
 endif
 
 libinterp_liboctinterp_la_SOURCES = \
@@ -163,6 +165,7 @@
   libinterp/octave-value/liboctave-value.la \
   libinterp/parse-tree/libparse-tree.la \
   libinterp/corefcn/libcorefcn.la \
+  $(LIBINTERP_DLDFCN_LIBADD) \
   liboctave/liboctave.la \
   $(LIBOCTINTERP_LINK_DEPS)