diff options
| author | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2010-11-23 18:38:16 +0000 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2010-11-23 18:38:16 +0000 |
| commit | 16f2fb18bc7db5fb359fd114c7cd04e38cdfd306 (patch) | |
| tree | 556c414a0c61d6337e470a251889783df6088225 /tools/Makefile | |
| parent | 762626dd33b8cded8c19f9d133f196def31684a9 (diff) | |
| download | xen-16f2fb18bc7db5fb359fd114c7cd04e38cdfd306.tar.gz xen-16f2fb18bc7db5fb359fd114c7cd04e38cdfd306.tar.bz2 xen-16f2fb18bc7db5fb359fd114c7cd04e38cdfd306.zip | |
Revert 61c0c52a8c6c "qemu-xen: build adjustments"
It appears that the changeset
qemu-xen: build adjustments to support out-of-tree builds
broke the build.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/Makefile')
| -rw-r--r-- | tools/Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tools/Makefile b/tools/Makefile index 9a97324abd..b5ca635409 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -81,15 +81,20 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \ --interp-prefix=$(CROSS_SYS_ROOT) endif -QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi) -ifneq ($(QEMU_ROOT),.) -export QEMU_ROOT -endif +ioemu/config-host.mak: + cd ioemu && XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure \ + --prefix=$(PREFIX) $(IOEMU_CONFIGURE_CROSS) + +subdir-all-ioemu subdir-install-ioemu: ioemu/config-host.mak + +subdir-clean-ioemu: + $(MAKE) -C ioemu distclean ioemu-dir-find: set -ex; \ if test -d $(CONFIG_QEMU); then \ - mkdir -p ioemu-dir; \ + rm -f ioemu-dir; \ + ln -sf $(CONFIG_QEMU) ioemu-dir; \ else \ if [ ! -d ioemu-remote ]; then \ rm -rf ioemu-remote ioemu-remote.tmp; \ @@ -110,7 +115,7 @@ ioemu-dir-find: $(absolutify_xen_root); \ $(buildmakevars2shellvars); \ cd ioemu-dir; \ - $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS) + ./xen-setup $(IOEMU_CONFIGURE_CROSS) .PHONY: ioemu-dir-force-update ioemu-dir-force-update: |