diff options
| author | ru <ru@FreeBSD.org> | 2007-10-01 18:22:32 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2007-10-01 18:22:32 +0000 |
| commit | 0ea9576a4d3c8cec356445aa34c765471dc136ac (patch) | |
| tree | 90e7bb1d3149059a948d4992dd3241a0069cdfe0 /Makefile.inc1 | |
| parent | 62d48a1604c31ca3959932216d8b9735207c594d (diff) | |
| download | FreeBSD-src-0ea9576a4d3c8cec356445aa34c765471dc136ac.zip FreeBSD-src-0ea9576a4d3c8cec356445aa34c765471dc136ac.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 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 8785d33..a0a011a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1027,12 +1027,20 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \ + lib/libopie lib/libpam ${_default_thread_lib} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} +.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no" +_default_thread_lib= lib/${DEFAULT_THREAD_LIB} +.elif ${MK_LIBTHR} != "no" +_default_thread_lib= lib/libthr +.elif ${MK_LIBPTHREAD} != "no" +_default_thread_lib= lib/libpthread +.endif + _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L |
