diff options
| author | obrien <obrien@FreeBSD.org> | 2007-10-09 23:31:11 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2007-10-09 23:31:11 +0000 |
| commit | a1598920aa3588377d6110e88ea72d957c11f95e (patch) | |
| tree | b7ca891b36f892551fbd2415b0541698736bf095 /lib | |
| parent | afb9b9ad446f13c595ddabec23d957cdef03e657 (diff) | |
| download | FreeBSD-src-a1598920aa3588377d6110e88ea72d957c11f95e.zip FreeBSD-src-a1598920aa3588377d6110e88ea72d957c11f95e.tar.gz | |
Tweak the handling of "WITHOUT_LIBPTHREAD". Also remove the accidental
treatment of 'LIBKSE' as an "old style" knob.
Submitted by: ru
Approved by: re(kensmith)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/libthr/Makefile | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/Makefile b/lib/Makefile index 0f45151..4661125 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -100,7 +100,6 @@ _libsmb= libsmb _libsmb= libsmb .endif -.if ${MK_LIBPTHREAD} != "no" .if ${MK_LIBKSE} != "no" _libkse= libkse .endif @@ -108,7 +107,6 @@ _libkse= libkse .if ${MK_LIBTHR} != "no" _libthr= libthr .endif -.endif .if ${MACHINE_ARCH} != "arm" _libthread_db= libthread_db diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 71202ca..a0f4069 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -10,7 +10,7 @@ .include <bsd.own.mk> -.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no") && \ +.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBKSE} == "no") && \ ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif @@ -44,7 +44,7 @@ PRECIOUSLIB= .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" -.if ${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no" +.if ${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBKSE} == "no" SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a .if !defined(NO_PIC) SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so |
