aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Thierry <julien.thierry@arm.com>2019-03-07 08:36:02 +0000
committerWill Deacon <will.deacon@arm.com>2019-04-26 14:55:05 +0100
commit90fa9c784d7a44713b1db00a27abd5efc88880fa (patch)
treeba5b8baaebcc8f7e9725a04cbb95cb3b760cc2df
parent7302327a491c6fd3613d5903c0310dd6abb1a74e (diff)
downloadkvmtool-90fa9c784d7a44713b1db00a27abd5efc88880fa.tar.gz
Makefile: Only compile vesa for archs that need it
The vesa framebuffer is only used by architectures that explicitly require it (i.e. x86). Compile it out for architectures not using it, as its current implementation might not work for them. Reviewed-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Julien Thierry <julien.thierry@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ec75cd99..25f13a0f 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,6 @@ OBJS += util/read-write.o
OBJS += util/util.o
OBJS += virtio/9p.o
OBJS += virtio/9p-pdu.o
-OBJS += hw/vesa.o
OBJS += hw/pci-shmem.o
OBJS += kvm-ipc.o
OBJS += builtin-sandbox.o
@@ -223,6 +222,8 @@ else
endif
ifeq (y,$(ARCH_HAS_FRAMEBUFFER))
+ OBJS += hw/vesa.o
+
CFLAGS_GTK3 := $(shell pkg-config --cflags gtk+-3.0 2>/dev/null)
LDFLAGS_GTK3 := $(shell pkg-config --libs gtk+-3.0 2>/dev/null)
ifeq ($(call try-build,$(SOURCE_GTK3),$(CFLAGS) $(CFLAGS_GTK3),$(LDFLAGS) $(LDFLAGS_GTK3)),y)