diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-09-12 10:41:51 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-09-12 10:41:51 +0100 |
| commit | fbf6c4db1e48d60e50c856418eda7947b185bc2f (patch) | |
| tree | e7b04e5aa068ff7c19e7246c97e18f34330efd27 /stubdom | |
| parent | e17887baa3998b62af929fd143e1a8e35266509a (diff) | |
| download | xen-fbf6c4db1e48d60e50c856418eda7947b185bc2f.tar.gz xen-fbf6c4db1e48d60e50c856418eda7947b185bc2f.tar.bz2 xen-fbf6c4db1e48d60e50c856418eda7947b185bc2f.zip | |
stubdom: compile stubdom with qemu-remote
Remove the CONFIG_QEMU override; fixing lwip isystem path.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'stubdom')
| -rw-r--r-- | stubdom/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/stubdom/Makefile b/stubdom/Makefile index b94c4422a8..74112c9b92 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -7,8 +7,6 @@ export stubdom=y export debug=y include $(XEN_ROOT)/Config.mk -override CONFIG_QEMU=ioemu - IOEMU_OPTIONS=--disable-sdl --disable-opengl --disable-vnc-tls --disable-brlapi --disable-kqemu ZLIB_URL?=http://www.zlib.net ZLIB_VERSION=1.2.3 @@ -59,8 +57,8 @@ TARGET_CPPFLAGS += -nostdinc TARGET_CPPFLAGS += -isystem $(CURDIR)/$(MINI_OS)/include/posix TARGET_CPPFLAGS += -isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include TARGET_CPPFLAGS += -isystem $(GCC_INSTALL)include -TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip/src/include -TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip/src/include/ipv4 +TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip-$(XEN_TARGET_ARCH)/src/include +TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip-$(XEN_TARGET_ARCH)/src/include/ipv4 TARGET_CPPFLAGS += -I$(CURDIR)/include TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib @@ -164,7 +162,10 @@ lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz .PHONY: $(CROSS_ROOT) $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci -mk-headers-$(XEN_TARGET_ARCH): +$(XEN_ROOT)/tools/ioemu-dir: + make -C $(XEN_ROOT)/tools ioemu-dir-find + +mk-headers-$(XEN_TARGET_ARCH): $(XEN_ROOT)/tools/ioemu-dir mkdir -p include/xen && \ ln -sf $(addprefix ../../,$(wildcard $(XEN_ROOT)/xen/include/public/*.h)) include/xen && \ ln -sf $(addprefix ../../$(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) include/xen && \ @@ -189,7 +190,7 @@ ifeq ($(CONFIG_QEMU),ioemu) ln -sf ../$(XEN_ROOT)/tools/ioemu/* .) else [ -h ioemu/Makefile ] || ( cd ioemu && \ - ln -sf $(CONFIG_QEMU)/* . && \ + ln -sf ../$(XEN_ROOT)/tools/ioemu-dir/* . && \ rm -fr i386-dm && \ rm -fr i386-stubdom && \ mkdir i386-dm && \ @@ -336,7 +337,7 @@ clean: $(MAKE) -C c clean rm -fr grub-$(XEN_TARGET_ARCH) [ ! -d libxc-$(XEN_TARGET_ARCH) ] || $(MAKE) -C libxc-$(XEN_TARGET_ARCH) clean - [ ! -d ioemu ] || $(MAKE) -C ioemu clean + -[ ! -d ioemu ] || $(MAKE) -C ioemu clean # clean the cross-compilation result .PHONY: crossclean |