MFC: r203918: Unbreak makefiles by removing mentions of DEFAULT_THREAD_LIB.
This commit is contained in:
parent
3322939bbb
commit
3343356549
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/stable/8/; revision=204048
@ -10,10 +10,6 @@
|
|||||||
|
|
||||||
.include <bsd.own.mk>
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
.if ${DEFAULT_THREAD_LIB} == "libc_r" && ${SHLIBDIR} == "/usr/lib"
|
|
||||||
SHLIBDIR= /lib
|
|
||||||
.endif
|
|
||||||
|
|
||||||
LIB=c_r
|
LIB=c_r
|
||||||
SHLIB_MAJOR= 7
|
SHLIB_MAJOR= 7
|
||||||
CFLAGS+=-DPTHREAD_KERNEL
|
CFLAGS+=-DPTHREAD_KERNEL
|
||||||
@ -32,16 +28,4 @@ PRECIOUSLIB=
|
|||||||
.include "${.CURDIR}/uthread/Makefile.inc"
|
.include "${.CURDIR}/uthread/Makefile.inc"
|
||||||
.include "${.CURDIR}/sys/Makefile.inc"
|
.include "${.CURDIR}/sys/Makefile.inc"
|
||||||
|
|
||||||
.if ${DEFAULT_THREAD_LIB} == "libc_r"
|
|
||||||
.if ${MK_INSTALLLIB} != "no"
|
|
||||||
SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
|
|
||||||
.endif
|
|
||||||
.if !defined(NO_PIC)
|
|
||||||
SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
|
|
||||||
.endif
|
|
||||||
.if ${MK_PROFILE} != "no"
|
|
||||||
SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
|
|
||||||
.endif
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
@ -10,15 +10,7 @@
|
|||||||
|
|
||||||
.include <bsd.own.mk>
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
.if ${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no"
|
|
||||||
LIB=kse
|
|
||||||
.if ${SHLIBDIR} == "/usr/lib"
|
|
||||||
SHLIBDIR= /lib
|
|
||||||
.endif
|
|
||||||
.else
|
|
||||||
SHLIB=kse
|
SHLIB=kse
|
||||||
.endif
|
|
||||||
|
|
||||||
SHLIB_MAJOR= 4
|
SHLIB_MAJOR= 4
|
||||||
CFLAGS+=-DPTHREAD_KERNEL
|
CFLAGS+=-DPTHREAD_KERNEL
|
||||||
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
|
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
|
||||||
@ -51,16 +43,4 @@ PRECIOUSLIB=
|
|||||||
.include "${.CURDIR}/sys/Makefile.inc"
|
.include "${.CURDIR}/sys/Makefile.inc"
|
||||||
.include "${.CURDIR}/thread/Makefile.inc"
|
.include "${.CURDIR}/thread/Makefile.inc"
|
||||||
|
|
||||||
.if ${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no"
|
|
||||||
.if ${MK_INSTALLLIB} != "no"
|
|
||||||
SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
|
|
||||||
.endif
|
|
||||||
.if !defined(NO_PIC)
|
|
||||||
SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
|
|
||||||
.endif
|
|
||||||
.if ${MK_PROFILE} != "no"
|
|
||||||
SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
|
|
||||||
.endif
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
Loading…
Reference in New Issue
Block a user