The branch main has been updated by jrtc27:
URL:
https://cgit.FreeBSD.org/src/commit/?id=3923bf59f99295b66c8c36c4d5f03f9e39393274
commit 3923bf59f99295b66c8c36c4d5f03f9e39393274
Author: Jessica Clarke <jrt...@freebsd.org>
AuthorDate: 2025-06-16 21:29:36 +0000
Commit: Jessica Clarke <jrt...@freebsd.org>
CommitDate: 2025-06-16 21:29:36 +0000
tools/build: Provide extra headers on non-FreeBSD
These will be needed by future changes to continue to allow building
makefs as a bootstrap tool on Linux and macOS. This also requires
defining __sbintime_t in our cross-build sys/_types.
---
tools/build/Makefile | 6 ++++++
tools/build/cross-build/include/common/sys/_types.h | 3 +++
2 files changed, 9 insertions(+)
diff --git a/tools/build/Makefile b/tools/build/Makefile
index 40ac498bfbb4..83f589ce3864 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -270,6 +270,12 @@ subr_capability.c: ${SRCTOP}/sys/kern/subr_capability.c
cp ${.ALLSRC} ${.TARGET}
SRCS+= subr_capability.c
CLEANFILES+= subr_capability.c
+
+# Headers needed for msdosfs use in makefs
+SYSINCS+= ${SRCTOP}/sys/sys/_callout.h
+SYSINCS+= ${SRCTOP}/sys/sys/_lock.h
+SYSINCS+= ${SRCTOP}/sys/sys/_lockmgr.h
+SYSINCS+= ${SRCTOP}/sys/sys/_task.h
.endif # ${MAKE.OS} != "FreeBSD"
CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_fileargs.h
diff --git a/tools/build/cross-build/include/common/sys/_types.h
b/tools/build/cross-build/include/common/sys/_types.h
index 408f0537d1e6..dc1b76f25063 100644
--- a/tools/build/cross-build/include/common/sys/_types.h
+++ b/tools/build/cross-build/include/common/sys/_types.h
@@ -48,3 +48,6 @@ typedef __builtin_va_list __va_list;
/* Needed for opensolaris compat. */
typedef __int64_t off64_t;
+
+/* Needed for sys/_callout.h */
+typedef __int64_t __sbintime_t;
