Skip to content

Commit 605fe33

Browse files
ptesariksdimitro
authored andcommitted
tests: Fix linking of utility programs
The GNU linker used to link against all libraries that were specified on the command line. Since libkdumpfile also drags in libaddrxlat, linking with libkdumpfile always worked. This behaviour changed at some point, and now libraries are linked only if a library symbol is actually needed. These utilities do not use anything from libkdumpfile, so this object is removed from the list, and then linking fails. This fixes issue #30. Reported-by: Serapheim Dimitropoulos <serapheim@delphix.com> Signed-off-by: Petr Tesarik <ptesarik@suse.com>
1 parent 49930db commit 605fe33

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

tests/Makefile.am

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,25 @@ subattr_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
9191

9292
sys_xlat_LDADD = \
9393
$(LDADD) \
94-
$(top_builddir)/src/kdumpfile/libkdumpfile.la
94+
$(top_builddir)/src/addrxlat/libaddrxlat.la
9595

9696
thread_errstr_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
9797
typed_attr_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
9898
vmci_cleanup_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
9999
vmci_lines_post_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
100100
vmci_post_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
101-
vtop_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
102-
xlatmap_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la -ldl
103-
xlatop_LDADD = $(top_builddir)/src/kdumpfile/libkdumpfile.la
101+
vtop_LDADD = \
102+
$(top_builddir)/src/kdumpfile/libkdumpfile.la \
103+
$(top_builddir)/src/addrxlat/libaddrxlat.la
104+
xlatmap_LDADD = \
105+
$(top_builddir)/src/addrxlat/libaddrxlat.la \
106+
-ldl
107+
xlatop_LDADD = $(top_builddir)/src/addrxlat/libaddrxlat.la
104108

105109
xlat_os_SOURCES = xlat-os.c
106110
xlat_os_LDADD = \
107111
$(LDADD) \
108-
$(top_builddir)/src/kdumpfile/libkdumpfile.la
112+
$(top_builddir)/src/addrxlat/libaddrxlat.la
109113

110114
check_PROGRAMS = \
111115
addrxlat \

0 commit comments

Comments
 (0)