diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2007-10-09 23:31:11 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2007-10-09 23:31:11 +0000 |
| commit | 946367b8e29f567f4d24c3553de8cbe925a0ade3 (patch) | |
| tree | b7ca891b36f892551fbd2415b0541698736bf095 /cddl | |
| parent | 8846f7d29664d208350ca803c859f03ceddad1a4 (diff) | |
| download | src-946367b8e29f567f4d24c3553de8cbe925a0ade3.tar.gz src-946367b8e29f567f4d24c3553de8cbe925a0ade3.zip | |
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)
Notes
Notes:
svn path=/head/; revision=172500
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 f517dfe109d1..522dda7331f4 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_LIBKSE} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _libzpool= libzpool .endif .endif diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile index 0ec531020c52..439a2c9c7818 100644 --- a/cddl/usr.bin/Makefile +++ b/cddl/usr.bin/Makefile @@ -5,7 +5,7 @@ SUBDIR= ${_ztest} .if ${MK_ZFS} != "no" -.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no") +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _ztest= ztest .endif .endif diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile index 5caee344521d..913e2ae35b7b 100644 --- a/cddl/usr.sbin/Makefile +++ b/cddl/usr.sbin/Makefile @@ -5,7 +5,7 @@ SUBDIR= ${_zdb} .if ${MK_ZFS} != "no" -.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no") +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _zdb= zdb .endif .endif |