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 /stubdom | |
| 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 'stubdom')
| -rw-r--r-- | stubdom/Makefile | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/stubdom/Makefile b/stubdom/Makefile index d1c6b0a5b5..d3af867a23 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -215,9 +215,6 @@ $(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 @@ -234,13 +231,6 @@ 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 && \ @@ -297,8 +287,8 @@ ioemu: cross-zlib cross-libpci libxc TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \ TARGET_CFLAGS="$(TARGET_CFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ - $(QEMU_ROOT)/xen-setup-stubdom ) - $(CROSS_MAKE) -C ioemu -f $(QEMU_ROOT)/Makefile + ./xen-setup-stubdom ) + $(CROSS_MAKE) -C ioemu ###### # caml |