summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2019-04-08 17:38:44 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2019-04-12 11:19:58 +0200
commit366f9867ebb0ad74f962d5626a784ec4924cfce1 (patch)
tree554def94b20e03f354bbbdc13fa645103f57edf9
parent8c3fc3c503842f7cc10774488491be6e4c6e8d4c (diff)
downloadNetworkManager-366f9867ebb0ad74f962d5626a784ec4924cfce1.tar.gz
build: fix build with sanitizers
Add missing linker flags.
-rw-r--r--Makefile.am26
1 files changed, 24 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 5fe9136835..bfdec612b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -213,6 +213,9 @@ shared_libcsiphash_la_CPPFLAGS = \
$(SANITIZER_LIB_CFLAGS) \
$(NULL)
+shared_libcsiphash_la_LDFLAGS = \
+ $(SANITIZER_LIB_LDFLAGS)
+
shared_libcsiphash_la_SOURCES = \
shared/c-siphash/src/c-siphash.c \
shared/c-siphash/src/c-siphash.h \
@@ -232,6 +235,9 @@ shared_libcrbtree_la_CPPFLAGS = \
$(SANITIZER_LIB_CFLAGS) \
$(NULL)
+shared_libcrbtree_la_LDFLAGS = \
+ $(SANITIZER_LIB_LDFLAGS)
+
shared_libcrbtree_la_SOURCES = \
shared/c-rbtree/src/c-rbtree.c \
shared/c-rbtree/src/c-rbtree.h \
@@ -259,6 +265,9 @@ shared_libnacd_la_CPPFLAGS = \
-I$(srcdir)/shared/c-rbtree/src \
$(NULL)
+shared_libnacd_la_LDFLAGS = \
+ $(SANITIZER_LIB_LDFLAGS)
+
shared_libnacd_la_SOURCES = \
shared/n-acd/src/n-acd.c \
shared/n-acd/src/n-acd.h \
@@ -374,6 +383,11 @@ shared_nm_utils_tests_test_shared_general_CPPFLAGS = \
$(SANITIZER_LIB_CFLAGS) \
$(NULL)
+shared_nm_utils_tests_test_shared_general_LDFLAGS = \
+ $(CODE_COVERAGE_LDFLAGS) \
+ $(SANITIZER_EXEC_LDFLAGS) \
+ $(NULL)
+
shared_nm_utils_tests_test_shared_general_LDADD = \
shared/nm-utils/libnm-utils-base.la \
$(GLIB_LIBS) \
@@ -964,7 +978,7 @@ libnm_core_tests_ldadd = \
$(GLIB_LIBS)
libnm_core_tests_ldflags = \
- $(SANITIZER_LIB_LDFLAGS)
+ $(SANITIZER_EXEC_LDFLAGS)
libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd)
libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd)
@@ -1387,7 +1401,7 @@ libnm_tests_ldadd = \
$(GLIB_LIBS)
libnm_tests_ldflags = \
- $(SANITIZER_LIB_LDFLAGS)
+ $(SANITIZER_EXEC_LDFLAGS)
libnm_tests_test_general_CPPFLAGS = $(libnm_tests_cppflags)
libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags)
@@ -1416,6 +1430,10 @@ libnm_tests_test_secret_agent_SOURCES = \
libnm_tests_test_general_LDADD = \
libnm/libnm-utils.la \
$(libnm_tests_ldadd)
+
+libnm_tests_test_general_LDFLAGS = \
+ $(libnm_tests_ldflags)
+
libnm_tests_test_nm_client_LDADD = $(libnm_tests_ldadd)
libnm_tests_test_remote_settings_client_LDADD = $(libnm_tests_ldadd)
libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd)
@@ -3710,6 +3728,10 @@ $(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
src_tests_test_systemd_CPPFLAGS = \
$(src_libnm_systemd_core_la_cppflags) \
-DNETWORKMANAGER_COMPILATION_TEST
+
+src_tests_test_systemd_LDFLAGS = \
+ $(SANITIZER_EXEC_LDFLAGS)
+
src_tests_test_systemd_LDADD = \
src/libnm-systemd-core.la \
shared/systemd/libnm-systemd-shared.la \