From 3725ce94ae60136f22d7986ca96f0a67d6be62e5 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 8 Oct 2019 15:20:39 -0400 Subject: [PATCH] port: fix link order of babeltrace2.exe On both Cygwin and MINGW, the link order of static libraries in an exe requires the dependent libraries to come first. In this case 'libbabeltrace2-param-parse.la' depends on 'libbabeltrace2.la' for the 'bt_value_bool_create_init' symbol and thus has to be listed before. Signed-off-by: Michael Jeanson Change-Id: I64df3dddcc65233c63f61af3fe7a6a093990c203 Reviewed-on: https://review.lttng.org/c/babeltrace/+/2153 Reviewed-by: Simon Marchi Tested-by: jenkins --- src/cli/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index e5567843..cda8977f 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am @@ -54,12 +54,12 @@ babeltrace2_bin_LDFLAGS = $(LD_NO_AS_NEEDED) babeltrace2_bin_LDADD = \ $(top_builddir)/src/argpar/libbabeltrace2-argpar.la \ $(top_builddir)/src/autodisc/libbabeltrace2-autodisc.la \ + $(top_builddir)/src/param-parse/libbabeltrace2-param-parse.la \ $(top_builddir)/src/lib/libbabeltrace2.la \ $(top_builddir)/src/compat/libcompat.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ $(top_builddir)/src/logging/libbabeltrace2-logging.la \ - $(top_builddir)/src/ctfser/libbabeltrace2-ctfser.la \ - $(top_builddir)/src/param-parse/libbabeltrace2-param-parse.la + $(top_builddir)/src/ctfser/libbabeltrace2-ctfser.la if ENABLE_BUILT_IN_PLUGINS # Takes a plugin name and outputs the needed LDFLAGS to embed it. -- 2.34.1