Link minios.o into rumprun.o

Mirrors what platform/hw does.

diff --git a/platform/xen/Makefile b/platform/xen/Makefile
index 4985af5cc358c7c0dbe0a8499eba3823efedbff8..1124c3a5aee9cd7ae8732996911756506e8af4a4 100644 (file)
--- a/platform/xen/Makefile
+++ b/platform/xen/Makefile
@@ -1,15 +1,14 @@
 PLATFORM=xen
 PLATFORM_DEFAULT_TESTER=xen
 
-.PHONY: default
-default: prepare mini-os commonlibs rumprun app-tools buildtest
-
 include ../../global.mk
 -include config.mk
 ifdef BUILDRUMP_TOOLFLAGS
 include ${BUILDRUMP_TOOLFLAGS}
 endif
 
+MAINOBJ= $(abspath $(OBJ_DIR)/rumprun-xen-$(MACHINE_ARCH).o)
+
 #
 # Rumprun-xen Makefile.
 # Abandon all hope, ye who enter here:
@@ -18,6 +17,9 @@ endif
 #
 OBJ_DIR ?= $(CURDIR)/obj
 
+.PHONY: default
+default: prepare commonlibs mini-os $(MAINOBJ) app-tools buildtest
+
 include ../Makefile.inc
 
 CPPFLAGS = -isystem rump/include -isystem xen/include -I. -I../../include
@@ -42,7 +44,8 @@ rump-src-y += rumphyper_bio.c
 rump-src-y += init.c
 
 # Rump kernel middleware objects to build.
-RUMP_OBJS := $(patsubst %.c,$(OBJ_DIR)/%.o,$(rump-src-y))
+RUMP_OBJS = $(patsubst %.c,$(OBJ_DIR)/%.o,$(rump-src-y))
+RUMP_OBJS+= $(OBJ_DIR)/xen/minios.o
 
 $(OBJ_DIR)/%.o: %.c $(HDRS) $(EXTRA_DEPS)
        $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
@@ -58,15 +61,11 @@ mini-os:
 links:
        $(MAKE) -C xen links
 
-.PHONY: rumprun
-rumprun: $(OBJ_DIR)/rumprun.o
-
-$(OBJ_DIR)/rumprun.o: $(RUMP_OBJS) commonlibs
+$(MAINOBJ): $(RUMP_OBJS) commonlibs
        $(CC) -Wl,-r $(CFLAGS) $(LDFLAGS) $(RUMP_OBJS) -nostdlib -o $@
 
 APP_TOOLS_PLATFORM= xen
-APP_TOOLS_OBJS_BAKE=   $(abspath $(OBJ_DIR)/xen/minios.o)
-APP_TOOLS_OBJS_BAKE+=  $(abspath $(OBJ_DIR)/rumprun.o)
+APP_TOOLS_OBJS_BAKE=   $(MAINOBJ)
 APP_TOOLS_LDSCRIPT_BAKE:= $(abspath $(OBJ_DIR)/xen/minios.lds)
 APP_TOOLS_DIR= $(abspath ../../app-tools)