From 8f969983389d428de381469944712e468f99e345 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 10 Jul 2008 14:15:46 +0100 Subject: stubdom: fixes to compile with qemu-xen This adds fixes to the stub domain build into compiling Ian Jackson's qemu-xen. The most notable change is that mini-os headers now #include each other through a mini-os/ prefix, so that we can turn all -I into -isystem and still be sure that we include Mini-OS headers (and not qemu's console.h or blktaplib's list.h for instance...). Signed-off-by: Samuel Thibault --- extras/mini-os/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'extras/mini-os/Makefile') diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index bc55145f3a..5ef4e03811 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -55,6 +55,8 @@ endif .PHONY: links links: $(ARCH_LINKS) [ -e include/xen ] || ln -sf ../../../xen/include/public include/xen + [ -e include/mini-os ] || ln -sf . include/mini-os + [ -e include/$(TARGET_ARCH_FAM)/mini-os ] || ln -sf . include/$(TARGET_ARCH_FAM)/mini-os .PHONY: arch_lib arch_lib: @@ -89,7 +91,7 @@ OBJS := $(filter-out $(OBJ_DIR)/daytime.o, $(OBJS)) endif $(OBJ_DIR)/$(TARGET)_app.o: $(APP_OBJS) app.lds - $(LD) -r -d $(LDFLAGS) $^ $(APP_LDLIBS) --undefined main -o $@ + $(LD) -r -d $(LDFLAGS) -\( $^ -\) $(APP_LDLIBS) --undefined main -o $@ $(OBJ_DIR)/$(TARGET): links $(OBJS) $(OBJ_DIR)/$(TARGET)_app.o arch_lib $(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(OBJ_DIR)/$(TARGET)_app.o $(OBJS) $(LDARCHLIB) $(LDLIBS) -o $@.o -- cgit v1.2.3