aboutsummaryrefslogtreecommitdiffstats
path: root/extras/mini-os/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'extras/mini-os/Makefile')
-rw-r--r--extras/mini-os/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile
index 4811f0dbfd..7cc4d0222e 100644
--- a/extras/mini-os/Makefile
+++ b/extras/mini-os/Makefile
@@ -88,6 +88,11 @@ OBJS += $(QEMUDIR)/i386-dm-stubdom/qemu.a $(QEMUDIR)/i386-dm-stubdom/libqemu.a
CFLAGS += -DCONFIG_QEMU
endif
+ifneq ($(CDIR),)
+OBJS += $(CDIR)/main.a
+LDLIBS +=
+endif
+
ifeq ($(libc),y)
LDLIBS += -L$(XEN_ROOT)/stubdom/libxc -lxenctrl -lxenguest
LDLIBS += -lpci
@@ -95,7 +100,7 @@ LDLIBS += -lz
LDLIBS += -lc
endif
-ifneq ($(caml)-$(qemu)-$(lwip),--y)
+ifneq ($(caml)-$(qemu)-$(CDIR)-$(lwip),---y)
OBJS := $(filter-out daytime.o, $(OBJS))
endif