diff options
| author | obrien <obrien@FreeBSD.org> | 2007-10-09 13:42:34 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2007-10-09 13:42:34 +0000 |
| commit | eb3f6a9e7473ee9d6e8016ce8d9cc1e8286bdd98 (patch) | |
| tree | c47a609d11ee2b49fc8234ffe6ee4e508318db84 /cddl | |
| parent | 8e21b1f738e3a7d52ec50aa5730787013a76a4d5 (diff) | |
| download | FreeBSD-src-eb3f6a9e7473ee9d6e8016ce8d9cc1e8286bdd98.zip FreeBSD-src-eb3f6a9e7473ee9d6e8016ce8d9cc1e8286bdd98.tar.gz | |
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)
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/lib/Makefile | 2 | ||||
| -rw-r--r-- | cddl/usr.bin/Makefile | 2 | ||||
| -rw-r--r-- | cddl/usr.sbin/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index 138f607..f517dfe 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 2ca99cb..0ec5310 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 f8b81fc..5caee34 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 |
