diff options
| author | ru <ru@FreeBSD.org> | 2007-10-01 18:29:55 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2007-10-01 18:29:55 +0000 |
| commit | 08a6766d3ab103ed283100af0b5f314fd377bf5c (patch) | |
| tree | d5d1126446f955a2813790cb7667a9356c336be1 /lib | |
| parent | 7ef0a53855ac0365dd58ce0b3a7469722023d542 (diff) | |
| download | FreeBSD-src-08a6766d3ab103ed283100af0b5f314fd377bf5c.zip FreeBSD-src-08a6766d3ab103ed283100af0b5f314fd377bf5c.tar.gz | |
Always install libpthread.* symlinks if at least one of
the threading libraries is built. This simplifies the
logic in makefiles that need to check if the pthreads
support is present. It also fixes a bug where we would
build a threading library that we shouldn't have built:
for example, building with WITHOUT_LIBTHR and the default
value of DEFAULT_THREADING_LIB (libthr) would mistakenly
build the libthr library, but not install it.
Approved by: re (kensmith)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libthr/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 7888f05..71202ca 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -10,7 +10,8 @@ .include <bsd.own.mk> -.if ${DEFAULT_THREAD_LIB} == "libthr" && ${SHLIBDIR} == "/usr/lib" +.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no") && \ + ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif @@ -43,7 +44,7 @@ PRECIOUSLIB= .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" -.if ${DEFAULT_THREAD_LIB} == "libthr" +.if ${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no" SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a .if !defined(NO_PIC) SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so |
