diff -ur oxen-unstable/extras/mini-os/lib/printf.c xen-unstable/extras/mini-os/lib/printf.c --- oxen-unstable/extras/mini-os/lib/printf.c 2006-05-25 01:02:20.000000000 -0400 +++ xen-unstable/extras/mini-os/lib/printf.c 2006-05-25 07:41:49.000000000 -0400 @@ -54,6 +54,8 @@ * $FreeBSD: src/sys/libkern/divdi3.c,v 1.6 1999/08/28 00:46:31 peter Exp $ */ +#if !defined HAVE_LIBC + #include #include #include @@ -789,4 +791,4 @@ return i; } - +#endif diff -ur oxen-unstable/extras/mini-os/lib/string.c xen-unstable/extras/mini-os/lib/string.c --- oxen-unstable/extras/mini-os/lib/string.c 2006-05-25 01:02:20.000000000 -0400 +++ xen-unstable/extras/mini-os/lib/string.c 2006-05-25 07:41:49.000000000 -0400 @@ -18,6 +18,8 @@ **************************************************************************** */ +#if !defined HAVE_LIBC + #include #include #include @@ -153,3 +155,5 @@ } return NULL; } + +#endif diff -ur oxen-unstable/extras/mini-os/Makefile xen-unstable/extras/mini-os/Makefile --- oxen-unstable/extras/mini-os/Makefile 2006-05-25 01:02:20.000000000 -0400 +++ xen-unstable/extras/mini-os/Makefile 2006-05-26 06:39:43.000000000 -0400 @@ -13,6 +13,7 @@ override CPPFLAGS := -Iinclude $(CPPFLAGS) ASFLAGS = -D__ASSEMBLY__ +LDLIBS = -L. -lminios LDFLAGS := -N -T minios-$(TARGET_ARCH).lds ifeq ($(TARGET_ARCH),x86_32) @@ -55,11 +56,11 @@ links: [ -e include/xen ] || ln -sf ../../../xen/include/public include/xen -libminios.a: $(OBJS) $(HEAD) - ar r libminios.a $(HEAD) $(OBJS) +libminios.a: links $(OBJS) $(HEAD) + $(AR) r libminios.a $(HEAD) $(OBJS) -$(TARGET): links libminios.a $(HEAD) - $(LD) $(LDFLAGS) $(HEAD) -L. -lminios -o $@.elf +$(TARGET): libminios.a $(HEAD) + $(LD) $(LDFLAGS) $(HEAD) $(LDLIBS) -o $@.elf gzip -f -9 -c $@.elf >$@.gz .PHONY: clean Only in xen-unstable/extras/mini-os: Makefile~