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.
This commit is contained in:
parent
c63a0cfddc
commit
5da4a0bd56
12 changed files with 14 additions and 9 deletions
|
@ -28,9 +28,9 @@ LDFLAGS+= -nostdlib -L${LIBDIR}
|
||||||
LDADD+= -lminlib
|
LDADD+= -lminlib
|
||||||
DPADD+= ${LIBMINLIB}
|
DPADD+= ${LIBMINLIB}
|
||||||
.if ${CC} == "gcc"
|
.if ${CC} == "gcc"
|
||||||
LDADD+= -lgcc -lsys -lgcc
|
LDADD+= -lgcc -lsys -lgcc -lminc
|
||||||
.elif ${CC} == "clang"
|
.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}
|
DPADD+= ${LIBC}
|
||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
|
|
@ -21,7 +21,7 @@ SUBDIR= csu ${LIBCOMPAT_DIR} ${LIBC_DIR} libcurses libdriver libnetdriver \
|
||||||
libddekit
|
libddekit
|
||||||
|
|
||||||
.if defined(NBSD_LIBC) && (${NBSD_LIBC} != "no")
|
.if defined(NBSD_LIBC) && (${NBSD_LIBC} != "no")
|
||||||
SUBDIR+= libelf
|
SUBDIR+= libelf libminc
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${COMPILER_TYPE} == "ack"
|
.if ${COMPILER_TYPE} == "ack"
|
||||||
|
|
|
@ -2,9 +2,14 @@
|
||||||
# Minimal libc for servers and drivers.
|
# Minimal libc for servers and drivers.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
|
LIB= minc
|
||||||
|
|
||||||
|
CPPFLAGS.sched_start.c+= -I${MINIXSRCDIR}
|
||||||
|
|
||||||
LIBCSRCDIR=${MINIXSRCDIR}/lib/nbsd_libc
|
LIBCSRCDIR=${MINIXSRCDIR}/lib/nbsd_libc
|
||||||
|
|
||||||
.if (${NBSD_LIBC} != "no")
|
|
||||||
MACHINE_ARCH=${MACHINE}
|
MACHINE_ARCH=${MACHINE}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -133,4 +138,4 @@ CPPFLAGS.${i}+= -I${LIBCSRCDIR}/include
|
||||||
|
|
||||||
CPPFLAGS+= -D_LIBSYS
|
CPPFLAGS+= -D_LIBSYS
|
||||||
|
|
||||||
.endif
|
.include <bsd.lib.mk>
|
|
@ -131,8 +131,8 @@ SRCS= \
|
||||||
|
|
||||||
CPPFLAGS.sched_start.c+= -I${MINIXSRCDIR}
|
CPPFLAGS.sched_start.c+= -I${MINIXSRCDIR}
|
||||||
|
|
||||||
.if (${NBSD_LIBC} != "no")
|
.if (${CC} == "gcc") || (${CC} == "clang")
|
||||||
.include "Makefile.libc.inc"
|
LDADD+= -lminc
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
.if ${COMPILER_TYPE} == "gnu"
|
.if ${COMPILER_TYPE} == "gnu"
|
||||||
|
|
||||||
.if ${CC} == "gcc"
|
.if ${CC} == "gcc"
|
||||||
LDADD+= -nodefaultlibs -lgcc -lsys -lgcc
|
LDADD+= -nodefaultlibs -lgcc -lsys -lgcc -lminc
|
||||||
.elif ${CC} == "clang"
|
.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
|
||||||
|
|
||||||
.endif
|
.endif
|
||||||
|
|
Loading…
Reference in a new issue