Re: git: 1c9ff80f0635 - main - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it

On 26 Dec 2025, at 19:36, Konstantin Belousov <kostikbel@gmail.com> wrote:
> 
> On Fri, Dec 26, 2025 at 03:29:16PM +0000, Dimitry Andric wrote:
>> The branch main has been updated by dim:
>> 
>> URL: https://cgit.FreeBSD.org/src/commit/?id=1c9ff80f06350fa44b7e50ce09ad665ab0082abb
>> 
>> commit 1c9ff80f06350fa44b7e50ce09ad665ab0082abb
>> Author:     Dimitry Andric <dim@FreeBSD.org>
>> AuthorDate: 2025-12-26 15:26:13 +0000
>> Commit:     Dimitry Andric <dim@FreeBSD.org>
>> CommitDate: 2025-12-26 15:26:13 +0000
>> 
>>    tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it
>> 
>>    This is needed to let the legacy stage compile against newer versions of
>>    sys/font.h, which transitively includes sys/cdefs.h, and requires the
>>    new __nonstring macro from it.
>> 
>>    Fixes:          e2c93ed09f25
>>    MFC after:      3 days
>> ---
>> tools/build/Makefile | 4 ++++
>> 1 file changed, 4 insertions(+)
>> 
>> diff --git a/tools/build/Makefile b/tools/build/Makefile
>> index a701c12a9b5c..2c6237c4dd7d 100644
>> --- a/tools/build/Makefile
>> +++ b/tools/build/Makefile
>> @@ -351,6 +351,10 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h
>> MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h
>> DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h
>> 
>> +# Needed to build most of the things below, which include sys/cdefs.h either
>> +# directly or transitively
>> +SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h
>> +
>> # Needed to build config (since it uses libnv)
>> SYSINCS+= ${SRCTOP}/sys/sys/_nv.h
>> SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \
> 
> Then the sys/_visible.h needs to be added as well if it is not added yet.

Thanks, committed that in 086bedb11a85.

-Dimitry