d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/build: Always bootstrap (sys/)bitstring.h

Browse Source 
Older, supported FreeBSD versions lack bit_ntest() so hoist the boostrap
installation out of the OS!=FreeBSD case and always install it.  A more
precise criteria is possible, but would add little value.

This fixes bootstrapping makefs as a build tool on 13.1.

Reviewed by:	jrtc27, emaste
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D37951
This commit is contained in:
Brooks Davis 2023-01-09 19:09:48 +00:00
parent 2c24ad3377
commit 3b073d2ee5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/build/Makefile
View File

@ -150,6 +150,11 @@ INCS+= ${SRCTOP}/include/nlist.h
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 @@ SYSINCS+= ${SRCTOP}/sys/sys/nlist_aout.h
# 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