diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2021-11-26 14:27:19 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2021-11-29 14:27:49 +0000 |
| commit | d364adc09c058ee838eef849072193b05d625f8b (patch) | |
| tree | bf7c157ed63f9fa102281eea08377a925befea4d | |
| parent | 4022f3eec40406dbd702d380ba27c875caf81e57 (diff) | |
Hoist cddl prebuild lib dependency definitions out of a MK_ZFS block
The compilation of several libraries under cddl/lib is not conditional
on MK_ZFS = "yes", so their dependency on libspl is not conditional
either. Unbreak buildworld when WITHOUT_ZFS is set.
Reported by: bz
Fixes: 9e9c651caceb ("cddl: fix missing ZFS library dependencies")
(cherry picked from commit 7b3642da21cb4b1c301d8c6b6ce0847d19d8a473)
| -rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 34bb10e6925f..995ed7af3e4b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2995,6 +2995,8 @@ _cddl_lib_libavl= cddl/lib/libavl _cddl_lib_libuutil= cddl/lib/libuutil _cddl_lib_libspl= cddl/lib/libspl +cddl/lib/libavl__L: cddl/lib/libspl__L +cddl/lib/libnvpair__L: cddl/lib/libspl__L cddl/lib/libuutil__L: cddl/lib/libavl__L cddl/lib/libspl__L .if ${MK_ZFS} != "no" @@ -3006,10 +3008,6 @@ _cddl_lib_libzfs_core= cddl/lib/libzfs_core _cddl_lib_libzfs= cddl/lib/libzfs _cddl_lib_libzfsbootenv= cddl/lib/libzfsbootenv -cddl/lib/libavl__L: cddl/lib/libspl__L - -cddl/lib/libnvpair__L: cddl/lib/libspl__L - cddl/lib/libtpool__L: cddl/lib/libspl__L cddl/lib/libzutil__L: cddl/lib/libavl__L lib/libgeom__L lib/msun__L cddl/lib/libtpool__L |