summaryrefslogtreecommitdiffstats
path: root/usr.bin/Makefile
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2006-11-26 14:36:34 +0000
committerru <ru@FreeBSD.org>2006-11-26 14:36:34 +0000
commit815d860c2f47f79db9345169bc2c5885333910b7 (patch)
tree41cff96be947a8a6e2ac9aff5183efb8a82d6d3b /usr.bin/Makefile
parentc2e4cdb2dad69b0a79e0f366b170b021a4cbd8f0 (diff)
downloadFreeBSD-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 'usr.bin/Makefile')
-rw-r--r--usr.bin/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 5b7ad04..04d62116 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -262,11 +262,8 @@ _calendar= calendar
.if ${MK_OPENSSL} != "no"
_chkey= chkey
_newkey= newkey
-.if ${MACHINE_ARCH} == "sparc64"
-.if ${MK_LIBTHR} != "no"
-_csup= csup
-.endif
-.elif ${MK_LIBPTHREAD} != "no"
+.if ${MK_LIBTHR} != "no" || \
+ (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")
_csup= csup
.endif
.endif
OpenPOWER on IntegriCloud