From 006e7188d48680d651cdf27a477b1af3b507de5d Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 14 Aug 2008 13:46:48 +0100 Subject: pv-grub: On x86_64, also build an x86_32 pv-grub This requires suffixing obj directories and having grub compiled outside sources. Signed-off-by: Samuel Thibault --- extras/mini-os/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extras/mini-os/Makefile') diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 5ef4e03811..ec24cba14a 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -66,8 +66,8 @@ ifeq ($(lwip),y) # lwIP library LWC := $(shell find $(LWIPDIR)/ -type f -name '*.c') LWC := $(filter-out %6.c %ip6_addr.c %ethernetif.c, $(LWC)) -LWC += lwip-arch.c lwip-net.c LWO := $(patsubst %.c,%.o,$(LWC)) +LWO += $(addprefix $(OBJ_DIR)/,lwip-arch.o lwip-net.o) $(OBJ_DIR)/lwip.a: $(LWO) $(RM) $@ @@ -79,7 +79,7 @@ endif OBJS := $(filter-out $(OBJ_DIR)/lwip%.o $(LWO), $(OBJS)) ifeq ($(libc),y) -APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libxc -whole-archive -lxenguest -lxenctrl -no-whole-archive +APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libxc-$(XEN_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive APP_LDLIBS += -lpci APP_LDLIBS += -lz APP_LDLIBS += -lm -- cgit v1.2.3