summaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorKamil Rytarowski <n54@gmx.com>2017-07-14 09:33:45 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-20 14:58:19 +0100
commitb1449edb799909f531b806538c48dc86d701c4b2 (patch)
treea1acc0830ac89f8153d7c051fb5479ce2aaf7f73 /Makefile.objs
parente0580342b3bd200a5f1d449129d11b1d2f5a24c0 (diff)
configure: Don't build ivshmem tools unless CONFIG_IVSHMEM is set
Don't try to build the ivshmem-server and ivshmem-client tools unless CONFIG_IVSHMEM is set. This fixes in passing a build bug on NetBSD, which fails to build the ivshmem tools because they use shm_open() and on NetBSD that requires linking against -lrt. Signed-off-by: Kamil Rytarowski <n54@gmx.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1500021225-4118-4-git-send-email-peter.maydell@linaro.org [PMM: moved some code into earlier patches; minor bugfixes; added commit message] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.objs b/Makefile.objs
index bfd5a6ceb1..24a4ea08b8 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -107,8 +107,8 @@ qga-vss-dll-obj-y = qga/
######################################################################
# contrib
-ivshmem-client-obj-y = contrib/ivshmem-client/
-ivshmem-server-obj-y = contrib/ivshmem-server/
+ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
+ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
libvhost-user-obj-y = contrib/libvhost-user/
vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)