| Message ID | 20180605160958.5434-1-laurent@vivier.eu |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] linux-user: disable qemu-bridge-helper and socket_scm_helper build | expand |
On 5 June 2018 at 17:09, Laurent Vivier <laurent@vivier.eu> wrote: > 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 <laurent@vivier.eu> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/Makefile b/Makefile index 6d588d1f71..be589cf1c5 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 86f90c0cb0..cb6c05dc33 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -923,7 +923,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)
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 <laurent@vivier.eu> --- Notes: v2: replace "ifeq ($(CONFIG_SOFTMMU),y)" by $(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) Makefile | 2 +- tests/Makefile.include | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)