On 11/12/2019 15.23, Paolo Bonzini wrote: > From: Marc-André Lureau <[email protected]> > > vhost-user-gpu is always built and installed, but it is not part of the > emulator > proper. Cut it if --disable-tools is specified. > > Signed-off-by: Marc-André Lureau <[email protected]> > Signed-off-by: Paolo Bonzini <[email protected]> > --- > Makefile | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/Makefile b/Makefile > index 53823c2..8d921c6 100644 > --- a/Makefile > +++ b/Makefile > @@ -321,14 +321,10 @@ HELPERS-y = > > HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = > qemu-bridge-helper$(EXESUF) > > -ifdef CONFIG_LINUX > -ifdef CONFIG_VIRGL > -ifdef CONFIG_GBM > +ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy) > HELPERS-y += vhost-user-gpu$(EXESUF) > vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json > endif > -endif > -endif
Reviewed-by: Thomas Huth <[email protected]>
