Skip to content

Commit e8d33d1

Browse files
committed
build: Add linker flags as suggested by output of bootstrap script.
* liboctave/wrappers/module.mk: Link liboctave with the LDFLAGS as suggested by the output of the gnulib bootstrap script. * liboctave/module.mk: Define liboctave_liboctave_la_LDFLAGS before including liboctave/wrappers/module.mk. Append to that variable later in this file.
1 parent 2c6b28d commit e8d33d1

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

liboctave/module.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ LIBOCTAVE_TEMPLATE_SRC =
6464
## A list of all files that could include tests
6565

6666
%canon_reldir%_liboctave_la_LIBADD =
67+
%canon_reldir%_liboctave_la_LDFLAGS =
6768

6869
include %reldir%/array/module.mk
6970
include %reldir%/external/module.mk
@@ -91,7 +92,7 @@ nodist_%canon_reldir%_liboctave_la_SOURCES = \
9192

9293
%canon_reldir%_liboctave_version_info = $(%canon_reldir%_liboctave_current):$(%canon_reldir%_liboctave_revision):$(%canon_reldir%_liboctave_age)
9394

94-
%canon_reldir%_liboctave_la_LDFLAGS = \
95+
%canon_reldir%_liboctave_la_LDFLAGS += \
9596
$(AM_LDFLAGS) \
9697
-version-info $(%canon_reldir%_liboctave_version_info) \
9798
$(NO_UNDEFINED_LDFLAG) \

liboctave/wrappers/module.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,5 @@ noinst_LTLIBRARIES += %reldir%/libwrappers.la
100100
-Ilibgnu -I$(srcdir)/libgnu
101101

102102
liboctave_liboctave_la_LIBADD += %reldir%/libwrappers.la
103+
104+
liboctave_liboctave_la_LDFLAGS += $(GNULIB_LINK_DEPS)

0 commit comments

Comments
 (0)