aboutsummaryrefslogtreecommitdiffstats
path: root/extras/mini-os/Makefile
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-08-14 13:46:48 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-08-14 13:46:48 +0100
commit006e7188d48680d651cdf27a477b1af3b507de5d (patch)
tree07c4e93058752a893b4b4b8b9776ae6c20a2f7cd /extras/mini-os/Makefile
parentf6c2c609f7ca5109c3871798ebb9966d0b08cdc0 (diff)
downloadxen-006e7188d48680d651cdf27a477b1af3b507de5d.tar.gz
xen-006e7188d48680d651cdf27a477b1af3b507de5d.tar.bz2
xen-006e7188d48680d651cdf27a477b1af3b507de5d.zip
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 <samuel.thibault@eu.citrix.com>
Diffstat (limited to 'extras/mini-os/Makefile')
-rw-r--r--extras/mini-os/Makefile4
1 files changed, 2 insertions, 2 deletions
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