summaryrefslogtreecommitdiffstats
path: root/share/mk
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2007-10-09 23:31:11 +0000
committerobrien <obrien@FreeBSD.org>2007-10-09 23:31:11 +0000
commita1598920aa3588377d6110e88ea72d957c11f95e (patch)
treeb7ca891b36f892551fbd2415b0541698736bf095 /share/mk
parentafb9b9ad446f13c595ddabec23d957cdef03e657 (diff)
downloadFreeBSD-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 'share/mk')
-rw-r--r--share/mk/bsd.compat.mk1
-rw-r--r--share/mk/bsd.own.mk6
2 files changed, 5 insertions, 2 deletions
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index 5c3a875..dfa5dfc 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -16,7 +16,6 @@
NOINFOCOMPRESS:NO_INFOCOMPRESS \
NOINSTALLLIB:NO_INSTALLLIB \
NOLIBPTHREAD:NO_LIBPTHREAD \
- NOLIBKSE:NO_LIBKSE \
NOLIBTHR:NO_LIBTHR \
NOLINT:NO_LINT \
NOMAN:NO_MAN \
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 92f3b3b..941950f 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -239,7 +239,6 @@ WITHOUT_${var}=
KERBEROS \
LIB32 \
LIBPTHREAD \
- LIBKSE \
LIBTHR \
LOCALES \
LPR \
@@ -426,6 +425,11 @@ MK_KERBEROS:= no
MK_NCP:= no
.endif
+.if ${MK_LIBPTHREAD} == "no"
+MK_LIBKSE:= no
+MK_LIBTHR:= no
+.endif
+
.if ${MK_OPENSSL} == "no"
MK_OPENSSH:= no
MK_KERBEROS:= no
OpenPOWER on IntegriCloud