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 /usr.sbin/Makefile | |
| 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 'usr.sbin/Makefile')
| -rw-r--r-- | usr.sbin/Makefile | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 8eac4b5..066ffa0 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -268,13 +268,16 @@ _ypset= ypset _authpf= authpf .endif +.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +_pppctl= pppctl +.endif + .if ${MK_LPR} != "no" _lpr= lpr .endif .if ${MK_NS_CACHING} != "no" -.if ${MK_LIBTHR} != "no" || \ - (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no") +.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" _nscd= nscd .endif .endif @@ -313,9 +316,6 @@ _mount_smbfs= mount_smbfs _mptable= mptable _ndiscvt= ndiscvt _pnpinfo= pnpinfo -.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no" -_pppctl= pppctl -.endif _sicontrol= sicontrol _spkrtest= spkrtest _zzz= zzz @@ -349,9 +349,6 @@ _mount_nwfs= mount_nwfs _mount_smbfs= mount_smbfs _mptable= mptable _ndiscvt= ndiscvt -.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no" -_pppctl= pppctl -.endif _sicontrol= sicontrol _spkrtest= spkrtest _zzz= zzz @@ -363,9 +360,6 @@ _acpi= acpi .endif _kgmon= kgmon _mount_smbfs= mount_smbfs -.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no" -_pppctl= pppctl -.endif _zzz= zzz .endif @@ -377,9 +371,6 @@ _nvram= nvram .if ${MACHINE_ARCH} == "sparc64" _eeprom= eeprom _ofwdump= ofwdump -.if ${MK_LIBTHR} != "no" -_pppctl= pppctl -.endif .endif .include <bsd.subdir.mk> |
