The branch main has been updated by jrtc27:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c9332a905cd2788bfa1c72c8f170c94500a765a2
commit c9332a905cd2788bfa1c72c8f170c94500a765a2
Author: Jessica Clarke <jrt...@freebsd.org>
AuthorDate: 2025-08-12 17:03:25 +0000
Commit: Jessica Clarke <jrt...@freebsd.org>
CommitDate: 2025-08-12 17:38:56 +0000
libspl: Don't build tunables.c when bootstrapping
The upstream source (which we've currently hacked downstream to make it
compile, even though it won't work) assumes ELF for its hand-rolled
linker set implementation, and macOS's Mach-O is sufficiently different
for it to not even compile there. However, we don't actually need this
file at all, since we only use the bootstrap libspl for DTrace tools, so
just add it to the set of files we don't build when bootstrapping.
Fixes: df58e8b1506f ("zfs: merge openzfs/zfs@8302b6e32")
---
cddl/lib/libspl/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index 13fd6d96f2af..d8d997c6f377 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -16,16 +16,16 @@ SRCS = \
os/freebsd/zone.c \
page.c \
timestamp.c \
- tunables.c \
include/sys/list.h \
include/sys/list_impl.h
-# These functions are not required when bootstrapping and the atomic code
-# will not compile when building on macOS.
+# These functions are not required when bootstrapping and the atomic code,
+# among others, will not compile when building on macOS.
.if !defined(BOOTSTRAPPING)
SRCS += \
atomic.c \
getexecname.c \
+ tunables.c \
os/freebsd/getexecname.c \
os/freebsd/gethostid.c \
os/freebsd/getmntany.c \
