From d5e8312ed9393473bfc55c1520956df83a2bc213 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 23 Nov 2010 19:12:55 +0000 Subject: Reapply 61c0c52a8c6c "qemu-xen: build adjustments" The changeset qemu-xen: build adjustments to support out-of-tree builds works after all. Sorry for the noise. Signed-off-by: Ian Jackson --- stubdom/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'stubdom') diff --git a/stubdom/Makefile b/stubdom/Makefile index d3af867a23..d1c6b0a5b5 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -215,6 +215,9 @@ $(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) + +ifeq ($(QEMU_ROOT),.) $(XEN_ROOT)/tools/ioemu-dir: $(CROSS_MAKE) -C $(XEN_ROOT)/tools ioemu-dir-find @@ -231,6 +234,13 @@ ioemu/linkfarm.stamp: $(XEN_ROOT)/tools/ioemu-dir )) | \ while read f; do rm -f "$$f"; ln -s "$$src/$$f" "$$f"; done touch ioemu/linkfarm.stamp +else +export QEMU_ROOT + +ioemu/linkfarm.stamp: + mkdir -p ioemu + touch ioemu/linkfarm.stamp +endif mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp mkdir -p include/xen && \ @@ -287,8 +297,8 @@ ioemu: cross-zlib cross-libpci libxc TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \ TARGET_CFLAGS="$(TARGET_CFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ - ./xen-setup-stubdom ) - $(CROSS_MAKE) -C ioemu + $(QEMU_ROOT)/xen-setup-stubdom ) + $(CROSS_MAKE) -C ioemu -f $(QEMU_ROOT)/Makefile ###### # caml -- cgit v1.2.3