diff mbox series

[lttng-tools] fix: Use DL_LIBS variable in ust multi-lib test

Message ID 20191024153633.17551-1-mjeanson@efficios.com
State Accepted, archived
Headers show
Series [lttng-tools] fix: Use DL_LIBS variable in ust multi-lib test | expand

Commit Message

Michael Jeanson Oct. 24, 2019, 3:36 p.m. UTC
Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
 tests/regression/ust/multi-lib/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jérémie Galarneau Nov. 5, 2019, 6:18 a.m. UTC | #1
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 <mjeanson at 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
>
diff mbox series

Patch

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