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

tools/build: Unbreak bmake bootstrap on Linux

Browse Source 
Currently make.py has a hack to add the cross-build headers to the
include search path when bootstrapping bmake on Linux (but not macOS).
This is a bit of an abuse of these headers, and e9ba1fd5eda2 was not
prepared for this, since sys/bitcount.h won't exist in that instance (it
gets copied into WORLDTMP during the legacy build). Work around this
until we can wean the bmake bootstrap off using these headers by not
including sys/bitcount.h when it doesn't exist.

Fixes:	e9ba1fd5eda2 ("tools/build: Provide FreeBSD's bitstring API when cross-building")
This commit is contained in:
Jessica Clarke 2022-08-22 22:02:53 +01:00
parent 564ed8e806
commit fba998a3d8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/build/cross-build/include/common/sys/types.h
View File

@ -69,7 +69,15 @@ struct cap_rights;
typedef struct cap_rights cap_rights_t;
/*
* make.py uses these headers during the bmake bootstrap on Linux only, at
* which point sys/bitcount.h won't yet exist, so don't include it there.
*
* TODO: Untangle this mess.
*/
#if __has_include(<sys/bitcount.h>)
/* Needed for bitstring */
#include <sys/bitcount.h>
#endif
#endif