X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2FMakefile.am;h=ef5a19aacac0ce2c6d69e6c9034aa7823a07356f;hb=1f647869ca97e90170b1d56d8735aeb5cfc77399;hp=3cd2a1168bf9c6aa760be97bb5d559672170d71a;hpb=de8bce8a6014b226e15a073f173f12d6eb2833d2;p=babeltrace.git

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 3cd2a116..ef5a19aa 100644
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -63,7 +63,7 @@ if ENABLE_BUILT_IN_PLUGINS
 # binary that are filled by plugin objects. If the linker discards those
 # symbols because the CLI does not use them directly, the CLI reports
 # no plugins found (plugins are effectively not embedded).
-pluginarchive = -Wl,--whole-archive,$(PLUGINS_PATH)/$(1)/.libs/babeltrace-plugin-$(1).a,--no-whole-archive
+pluginarchive = $(LD_WHOLE_ARCHIVE)$(PLUGINS_PATH)/$(1)/.libs/babeltrace-plugin-$(1).a$(LD_NO_WHOLE_ARCHIVE)
 
 # Built-in plugins
 babeltrace_bin_LDFLAGS += $(call pluginarchive,ctf)
@@ -72,6 +72,7 @@ babeltrace_bin_LDFLAGS += $(call pluginarchive,utils)
 
 if ENABLE_DEBUG_INFO
 babeltrace_bin_LDFLAGS += $(call pluginarchive,lttng-utils)
+babeltrace_bin_LDADD += $(ELFUTILS_LIBS)
 endif
 endif