Move minimal libc from libsys into separate lib.

Now users can choose between libsys, libsys + libminc and
libsys + libc. E.g. PUFFS/FUSE servers need libsys + libc while
old servers can use libsys + libminc.

kernel/Makefile

@@ -28,9 +28,9 @@ LDFLAGS+= -nostdlib -L${LIBDIR}
 LDADD+= -lminlib
 DPADD+= ${LIBMINLIB}
 .if ${CC} == "gcc"
-LDADD+=	-lgcc -lsys -lgcc
+LDADD+=	-lgcc -lsys -lgcc -lminc
 .elif ${CC} == "clang"
-LDADD+= -L/usr/pkg/lib -lCompilerRT-Generic -lsys -lCompilerRT-Generic
+LDADD+= -L/usr/pkg/lib -lCompilerRT-Generic -lsys -lCompilerRT-Generic -lminc
 DPADD+=	${LIBC}
 .endif
 .endif

lib/Makefile

@@ -21,7 +21,7 @@ SUBDIR= csu ${LIBCOMPAT_DIR} ${LIBC_DIR} libcurses libdriver libnetdriver \
 	libddekit
 
 .if defined(NBSD_LIBC) && (${NBSD_LIBC} != "no")
-SUBDIR+= libelf
+SUBDIR+= libelf libminc
 .endif
 
 .if ${COMPILER_TYPE} == "ack"

lib/libminc/Makefile

@@ -2,9 +2,14 @@
 # Minimal libc for servers and drivers.
 #
 
+.include <bsd.own.mk>
+
+LIB=		minc
+
+CPPFLAGS.sched_start.c+=	-I${MINIXSRCDIR}
+
 LIBCSRCDIR=${MINIXSRCDIR}/lib/nbsd_libc
 
-.if (${NBSD_LIBC} != "no")
 MACHINE_ARCH=${MACHINE}
 
 #
@@ -133,4 +138,4 @@ CPPFLAGS.${i}+= -I${LIBCSRCDIR}/include
 
 CPPFLAGS+= -D_LIBSYS
 
-.endif
+.include <bsd.lib.mk>

lib/libsys/Makefile

@@ -131,8 +131,8 @@ SRCS=  \
 
 CPPFLAGS.sched_start.c+=	-I${MINIXSRCDIR}
 
-.if (${NBSD_LIBC} != "no")
+.if (${CC} == "gcc") || (${CC} == "clang")
-.include "Makefile.libc.inc"
+LDADD+=	-lminc
 .endif
 
 .include <bsd.lib.mk>

share/mk/minix.service.mk

@@ -4,9 +4,9 @@
 .if ${COMPILER_TYPE} == "gnu"
 
 .if ${CC} == "gcc"
-LDADD+= -nodefaultlibs -lgcc -lsys -lgcc
+LDADD+= -nodefaultlibs -lgcc -lsys -lgcc -lminc
 .elif ${CC} == "clang"
-LDADD+= -nodefaultlibs -L/usr/pkg/lib -lCompilerRT-Generic -lsys -lCompilerRT-Generic
+LDADD+= -nodefaultlibs -L/usr/pkg/lib -lCompilerRT-Generic -lsys -lCompilerRT-Generic -lminc
 .endif
 
 .endif