[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/8] linux-user: disable qemu-bridge-helper and socke
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 3/8] linux-user: disable qemu-bridge-helper and socket_scm_helper build |
Date: |
Tue, 12 Jun 2018 12:58:26 +0200 |
linux-user targets don't need them, and if we ask to build statically
linked binaries, some static libraries they need are not available.
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
---
Makefile | 2 +-
tests/Makefile.include | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 023b3437ec..e4bc34a1cb 100644
--- a/Makefile
+++ b/Makefile
@@ -351,7 +351,7 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS)
-HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
+HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) =
qemu-bridge-helper$(EXESUF)
ifdef BUILD_DOCS
DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
diff --git a/tests/Makefile.include b/tests/Makefile.include
index d098a104bb..10397ed159 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -930,7 +930,7 @@ check-report.html: check-report.xml
# Other tests
-QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) =
tests/qemu-iotests/socket_scm_helper$(EXESUF)
+QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) =
tests/qemu-iotests/socket_scm_helper$(EXESUF)
.PHONY: check-tests/qemu-iotests-quick.sh
check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh
qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
--
2.14.4
- [Qemu-devel] [PULL 0/8] Linux user for 3.0 patches, Laurent Vivier, 2018/06/12
- [Qemu-devel] [PULL 1/8] linux-user: Export use is_error(), use it to avoid warnings, Laurent Vivier, 2018/06/12
- [Qemu-devel] [PULL 3/8] linux-user: disable qemu-bridge-helper and socket_scm_helper build,
Laurent Vivier <=
- [Qemu-devel] [PULL 4/8] qemu-binfmt-conf.sh: ignore the OS/ABI field, Laurent Vivier, 2018/06/12
- [Qemu-devel] [PULL 5/8] linux-user/alpha: Fix epoll syscalls, Laurent Vivier, 2018/06/12
- [Qemu-devel] [PULL 8/8] linux-user/sparc64: Add inotify_rm_watch and tee syscalls, Laurent Vivier, 2018/06/12
- [Qemu-devel] [PULL 2/8] linux-user: Use is_error() to avoid warnings and make the code clearer, Laurent Vivier, 2018/06/12
- [Qemu-devel] [PULL 7/8] linux-user/microblaze: Fix typo in accept4 syscall, Laurent Vivier, 2018/06/12
- [Qemu-devel] [PULL 6/8] linux-user/hppa: Fix typo in mknodat syscall, Laurent Vivier, 2018/06/12
- Re: [Qemu-devel] [PULL 0/8] Linux user for 3.0 patches, no-reply, 2018/06/12
- Re: [Qemu-devel] [PULL 0/8] Linux user for 3.0 patches, Peter Maydell, 2018/06/14