diff options
| author | ru <ru@FreeBSD.org> | 2006-11-26 14:36:34 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2006-11-26 14:36:34 +0000 |
| commit | 815d860c2f47f79db9345169bc2c5885333910b7 (patch) | |
| tree | 41cff96be947a8a6e2ac9aff5183efb8a82d6d3b /lib | |
| parent | c2e4cdb2dad69b0a79e0f366b170b021a4cbd8f0 (diff) | |
| download | FreeBSD-src-815d860c2f47f79db9345169bc2c5885333910b7.zip FreeBSD-src-815d860c2f47f79db9345169bc2c5885333910b7.tar.gz | |
- When building world WITHOUT_LIBPTHREAD, link libthr to libpthread.
- Don't build ngctl(8) and cached(8) if threading libs aren't built.
- Fix various issues in a cached(8) makefile.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libthr/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index e211586..4b8ce51 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -8,12 +8,12 @@ # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -.if ${MACHINE_ARCH} == "sparc64" -SHLIBDIR?= /lib -.endif - .include <bsd.own.mk> +.if ${MACHINE_ARCH} == "sparc64" || ${MK_LIBPTHREAD} == "no" +SHLIBDIR= /lib +.endif + LIB=thr SHLIB_MAJOR= 2 CFLAGS+=-DPTHREAD_KERNEL @@ -42,7 +42,7 @@ PRECIOUSLIB= .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_ARCH} == "sparc64" || ${MK_LIBPTHREAD} == "no" SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a .if !defined(NO_PIC) SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so |
