diff options
| author | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2010-11-23 19:12:55 +0000 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2010-11-23 19:12:55 +0000 |
| commit | d5e8312ed9393473bfc55c1520956df83a2bc213 (patch) | |
| tree | 2ad87ce9ff167e94a189920c1f1c69b4bda60d27 /stubdom | |
| parent | 16f2fb18bc7db5fb359fd114c7cd04e38cdfd306 (diff) | |
| download | xen-d5e8312ed9393473bfc55c1520956df83a2bc213.tar.gz xen-d5e8312ed9393473bfc55c1520956df83a2bc213.tar.bz2 xen-d5e8312ed9393473bfc55c1520956df83a2bc213.zip | |
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 <ian.jackson@eu.citrix.com>
Diffstat (limited to 'stubdom')
| -rw-r--r-- | stubdom/Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
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 |