Merged in master. Thanks! Jérémie
On Thu, Oct 24, 2019 at 11:36:33AM -0400, Michael Jeanson wrote: > Signed-off-by: Michael Jeanson <mjean...@efficios.com> > --- > tests/regression/ust/multi-lib/Makefile.am | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/regression/ust/multi-lib/Makefile.am > b/tests/regression/ust/multi-lib/Makefile.am > index 0ce46a7ff..52a1635c2 100644 > --- a/tests/regression/ust/multi-lib/Makefile.am > +++ b/tests/regression/ust/multi-lib/Makefile.am > @@ -3,11 +3,11 @@ EXTRA_DIST = test_multi_lib > noinst_PROGRAMS = exec-with-callsites exec-without-callsites > > exec_with_callsites_SOURCES = multi-lib-test.c callsites.c > -exec_with_callsites_LDFLAGS = -ldl $(POPT_LIBS) > +exec_with_callsites_LDFLAGS = $(DL_LIBS) $(POPT_LIBS) > exec_with_callsites_CFLAGS = $(POPT_CFLAGS) $(AM_CFLAGS) -DHAS_CALLSITES=1 > > exec_without_callsites_SOURCES = multi-lib-test.c > -exec_without_callsites_LDFLAGS = -ldl $(POPT_LIBS) $(UST_LIBS) > +exec_without_callsites_LDFLAGS = $(DL_LIBS) $(POPT_LIBS) $(UST_LIBS) > exec_without_callsites_LDADD = probes.o > exec_without_callsites_CFLAGS = $(POPT_CFLAGS) $(AM_CFLAGS) -DHAS_CALLSITES=0 > > -- > 2.17.1 > _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
