[PATCH] tools/xenstore: Don't link libxenstore against systemd

* [PATCH] tools/xenstore: Don't link libxenstore against systemd
@ 2018-03-07 11:13 Andrew Cooper
  2018-03-07 11:15 ` Wei Liu
  0 siblings, 1 reply; 2+ messages in thread
From: Andrew Cooper @ 2018-03-07 11:13 UTC (permalink / raw)
  To: Xen-devel; +Cc: Andrew Cooper, Ian Jackson, Wei Liu

It is only xenstored which uses libsystemd.  Avoid having libxenstored pull
libsystemd into the address space of all of its users.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
---
 tools/xenstore/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 0831be0..4473cf6 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -15,9 +15,6 @@ CFLAGS += $(CFLAGS_libxentoolcore)
 CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\""
 CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\""
 
-CFLAGS-$(CONFIG_SYSTEMD)  += $(SYSTEMD_CFLAGS)
-LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
-
 CFLAGS  += $(CFLAGS-y)
 LDFLAGS += $(LDFLAGS-y)
 
@@ -74,6 +71,11 @@ xenstored_probes.o: xenstored_solaris.o
 CFLAGS += -DHAVE_DTRACE=1
 endif
 
+ifeq ($(CONFIG_SYSTEMD),y)
+$(XENSTORED_OBJS): CFLAGS += $(SYSTEMD_CFLAGS)
+xenstored: LDFLAGS += $(SYSTEMD_LIBS)
+endif
+
 $(XENSTORED_OBJS): CFLAGS += $(CFLAGS_libxengnttab)
 
 xenstored: $(XENSTORED_OBJS)
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

^ permalink raw reply related	[flat|nested] 2+ messages in thread