Skip to contentSkip to conversation

Port: Link with no-undefined on Windows

PATCH Jérémie Galarneau 1 participant 1 message Feb 14, 2017 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Merged in master and stable-2.9.

Thanks!
Jérémie

Quoted 64 lines · Michael Jeanson
---
 configure.ac                     | 10 ++++++++++
 src/bin/lttng-relayd/Makefile.am |  4 ++--
 src/lib/lttng-ctl/Makefile.am    |  3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)
configure.ac +10 -0
index 4c7a826..954ffb4 100644
@@ -65,6 +65,16 @@ CC="$PTHREAD_CC"
 
 AX_LIB_SOCKET_NSL
 
+LT_NO_UNDEFINED=""
+AS_CASE([$host_os],
+  [cygwin*],
+    [
+      LT_NO_UNDEFINED="-no-undefined"
+    ]
+)
+
+AC_SUBST(LT_NO_UNDEFINED)
+
 # Compute minor/major/patchlevel version numbers
 major_version=$(echo AC_PACKAGE_VERSION | $SED 's/^\([[0-9]]\)*\.[[0-9]]*\.[[0-9]]*.*$/\1/')
 minor_version=$(echo AC_PACKAGE_VERSION | $SED 's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*.*$/\1/')
src/bin/lttng-relayd/Makefile.am +2 -2
index 4857074..df87bc3 100644
@@ -24,7 +24,6 @@ lttng_relayd_SOURCES = main.c lttng-relayd.h utils.h utils.c cmd.h \
 
 # link on liblttngctl for check if relayd is already alive.
 lttng_relayd_LDADD = -lurcu-common -lurcu \
-               $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
                $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
                $(top_builddir)/src/common/hashtable/libhashtable.la \
                $(top_builddir)/src/common/libcommon.la \
@@ -32,4 +31,5 @@ lttng_relayd_LDADD = -lurcu-common -lurcu \
                $(top_builddir)/src/common/index/libindex.la \
                $(top_builddir)/src/common/health/libhealth.la \
                $(top_builddir)/src/common/config/libconfig.la \
-               $(top_builddir)/src/common/testpoint/libtestpoint.la
+               $(top_builddir)/src/common/testpoint/libtestpoint.la \
+               $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
src/lib/lttng-ctl/Makefile.am +3 -1
index 5b87e38..6b6a6ee 100644
@@ -7,6 +7,9 @@ lib_LTLIBRARIES = liblttng-ctl.la
 liblttng_ctl_la_SOURCES = lttng-ctl.c snapshot.c lttng-ctl-helper.h \
                lttng-ctl-health.c save.c load.c deprecated-symbols.c
 
+liblttng_ctl_la_LDFLAGS = \
+               $(LT_NO_UNDEFINED)
+
 liblttng_ctl_la_LIBADD = \
                $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
                $(top_builddir)/src/common/libcommon.la \
--

2.7.4

Signature · 7 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev