From 9ee9a63590b793076a45c15d3abb4af57fe50eaf Mon Sep 17 00:00:00 2001 From: Yannick Lamarre Date: Fri, 22 Feb 2019 14:33:38 -0500 Subject: [PATCH] Enforce DL_LIBS value instead of hard coded -ldl MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Generated makefiles would ignore DL_LIBS value selected by configure script and use the hard coded value -ldl. Generated makefiles will now use DL_LIBS. Refs: #1165 Signed-off-by: Yannick Lamarre Signed-off-by: Jérémie Galarneau --- src/common/testpoint/Makefile.am | 2 +- tests/regression/ust/baddr-statedump/Makefile.am | 2 +- tests/regression/ust/ust-dl/Makefile.am | 2 +- tests/utils/testapp/userspace-probe-sdt-binary/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/testpoint/Makefile.am b/src/common/testpoint/Makefile.am index 5c15725eb..a2f9d407a 100644 --- a/src/common/testpoint/Makefile.am +++ b/src/common/testpoint/Makefile.am @@ -1,4 +1,4 @@ noinst_LTLIBRARIES = libtestpoint.la libtestpoint_la_SOURCES = testpoint.h testpoint.c -libtestpoint_la_LIBADD = -ldl +libtestpoint_la_LIBADD = $(DL_LIBS) diff --git a/tests/regression/ust/baddr-statedump/Makefile.am b/tests/regression/ust/baddr-statedump/Makefile.am index bf3271797..bf51f9483 100644 --- a/tests/regression/ust/baddr-statedump/Makefile.am +++ b/tests/regression/ust/baddr-statedump/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(srcdir) -g noinst_PROGRAMS = prog prog_SOURCES = prog.c tp.c tp.h -prog_LDADD = -llttng-ust -ldl +prog_LDADD = -llttng-ust $(DL_LIBS) noinst_SCRIPTS = test_baddr-statedump test_baddr-statedump.py EXTRA_DIST = test_baddr-statedump test_baddr-statedump.py diff --git a/tests/regression/ust/ust-dl/Makefile.am b/tests/regression/ust/ust-dl/Makefile.am index 9889e85a4..c51e072fc 100644 --- a/tests/regression/ust/ust-dl/Makefile.am +++ b/tests/regression/ust/ust-dl/Makefile.am @@ -19,7 +19,7 @@ AM_CPPFLAGS += -I$(srcdir) -g noinst_PROGRAMS = prog prog_SOURCES = prog.c -prog_LDADD = -ldl +prog_LDADD = $(DL_LIBS) noinst_LTLIBRARIES = libzzz.la libbar.la libfoo.la libtp.la diff --git a/tests/utils/testapp/userspace-probe-sdt-binary/Makefile.am b/tests/utils/testapp/userspace-probe-sdt-binary/Makefile.am index e86939b4c..d79ce0ea3 100644 --- a/tests/utils/testapp/userspace-probe-sdt-binary/Makefile.am +++ b/tests/utils/testapp/userspace-probe-sdt-binary/Makefile.am @@ -3,7 +3,7 @@ BUILT_SOURCES = foobar_provider.h noinst_PROGRAMS = userspace-probe-sdt-binary userspace_probe_sdt_binary_SOURCES = userspace-probe-sdt-binary.c sema.h sema.c -userspace_probe_sdt_binary_LDADD = foobar_provider.o libfoo.la libbar.la -ldl +userspace_probe_sdt_binary_LDADD = foobar_provider.o libfoo.la libbar.la $(DL_LIBS) userspace_probe_sdt_binary_CFLAGS = -I$(abs_builddir) nodist_userspace_probe_sdt_binary_SOURCES = $(abs_builddir)/foobar_provider.h -- 2.34.1