aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2007-10-09 13:42:34 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2007-10-09 13:42:34 +0000
commit65c045e96459361250134c2264b8d72c34266641 (patch)
treec47a609d11ee2b49fc8234ffe6ee4e508318db84 /cddl
parent4306354df10a0c535021ca6b6ada7e058b0b9634 (diff)
downloadsrc-65c045e96459361250134c2264b8d72c34266641.tar.gz
src-65c045e96459361250134c2264b8d72c34266641.zip
Repo copy libpthreads to libkse.
This introduces the WITHOUT_LIBKSE nob, and changes WITHOUT_LIBPTHREADS to mean with neither threading libs. Approved by: re(kensmith)
Notes
Notes: svn path=/head/; revision=172491
Diffstat (limited to 'cddl')
-rw-r--r--cddl/lib/Makefile2
-rw-r--r--cddl/usr.bin/Makefile2
-rw-r--r--cddl/usr.sbin/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
index 138f60740ee3..f517dfe109d1 100644
--- a/cddl/lib/Makefile
+++ b/cddl/lib/Makefile
@@ -11,7 +11,7 @@ SUBDIR= libavl \
.if ${MK_ZFS} != "no"
_libzfs= libzfs
-.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" || ${MK_LIBPTHREAD} != "no"
_libzpool= libzpool
.endif
.endif
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index 2ca99cbe1092..0ec531020c52 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -5,7 +5,7 @@
SUBDIR= ${_ztest}
.if ${MK_ZFS} != "no"
-.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
+.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no")
_ztest= ztest
.endif
.endif
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index f8b81fcdd1f1..5caee344521d 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -5,7 +5,7 @@
SUBDIR= ${_zdb}
.if ${MK_ZFS} != "no"
-.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
+.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no")
_zdb= zdb
.endif
.endif