]> xenbits.xensource.com Git - people/liuw/stubdom.git/commitdiff
stubdom/Makefile: use QEMU_TRADITIONAL_LOC
authorM A Young <m.a.young@durham.ac.uk>
Thu, 23 Oct 2014 17:37:43 +0000 (18:37 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 24 Oct 2014 15:19:26 +0000 (16:19 +0100)
In commit 8962a8f951ea83e8d10ee23aeb20266e4795b06e CONFIG_QEMU was
replaced by QEMU_TRADITIONAL_LOC. However stubdom/Makefile still uses
CONFIG_QEMU so building stubdom is likely to fail.  This patch
replaces CONFIG_QEMU with QEMU_TRADITIONAL_LOC in stubdom/Makefile as
well.

Signed-off-by: Michael Young <m.a.young@durham.ac.uk>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Makefile

index 2f9ca52a370860e10f7035503989fc2444d75251..8fb885ac3543634121863649fb0257be4f85b324 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -263,7 +263,7 @@ $(OCAML_STAMPFILE): ocaml-$(XEN_TARGET_ARCH)/.dirstamp
 .PHONY: $(CROSS_ROOT)
 $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci
 
-QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi)
+QEMU_ROOT := $(shell if [ -d "$(QEMU_TRADITIONAL_LOC)" ]; then echo "$(QEMU_TRADITIONAL_LOC)"; else echo .; fi)
 
 ifneq ($(filter ioemu,$(STUBDOM_TARGETS)),)
 IOEMU_LINKFARM_TARGET := ioemu/linkfarm.stamp