Page MenuHomeFreeBSD

D37951.id.diff
No OneTemporary

D37951.id.diff

diff --git a/tools/build/Makefile b/tools/build/Makefile
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -150,6 +150,11 @@
SYSINCS+= ${SRCTOP}/sys/sys/imgact_aout.h
SYSINCS+= ${SRCTOP}/sys/sys/nlist_aout.h
+# macOS's bitstring lacks FreeBSD-specific additions used by makefs's ZFS code
+# and Linux doesn't have it at all. Older FreeBSD versions lack recent
+# additions.
+INCS+= ${SRCTOP}/include/bitstring.h
+SYSINCS+= ${SRCTOP}/sys/sys/bitstring.h
.if ${.MAKE.OS} != "FreeBSD"
.PATH: ${.CURDIR}/cross-build
@@ -157,11 +162,6 @@
# Needed by our sys/types.h wrapper
SYSINCS+= ${SRCTOP}/sys/sys/bitcount.h
-# macOS's bitstring lacks FreeBSD-specific additions used by makefs's ZFS code
-# and Linux doesn't have it at all.
-INCS+= ${SRCTOP}/include/bitstring.h
-SYSINCS+= ${SRCTOP}/sys/sys/bitstring.h
-
# dbopen() behaves differently on Linux and FreeBSD so we ensure that we
# bootstrap the FreeBSD db code. The cross-build headers #define dbopen() to
# __freebsd_dbopen() so that we don't ever use the host version

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 10, 6:02 PM (11 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15744812
Default Alt Text
D37951.id.diff (1 KB)

Event Timeline