Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 29 Dec 2025 02:05:06 +0000
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Cc:        Ayrton Munoz <a.munoz3327@gmail.com>
Subject:   git: b6672803a1cf - main - cross-build: Avoid adding <sys/cdefs.h> to SYSINCS
Message-ID:  <6951e1d2.3d905.f3b3a4b@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=b6672803a1cf10dd1c912fe6571a8d426b8868bd

commit b6672803a1cf10dd1c912fe6571a8d426b8868bd
Author:     Ayrton Munoz <a.munoz3327@gmail.com>
AuthorDate: 2025-12-29 02:02:28 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2025-12-29 02:04:45 +0000

    cross-build: Avoid adding <sys/cdefs.h> to SYSINCS
    
    Summary:
    The sys/cdefs.h in src is incompatible with glibc's sys/cdefs.h so
    cross-building broke when the former was added to SYSINCS in 1c9ff80f06. This
    commit adds a guard around that to only do that when building on FreeBSD. This
    should fix github CI.
    
    Test Plan:
    Ran buildkernel using tools/build/make.py on linux in github CI and
    locally on FreeBSD to double check nothing broke.
    
    Reviewed by:    dim
    MFC after:      3 days
    Differential Revision: https://reviews.freebsd.org/D54385
---
 tools/build/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/build/Makefile b/tools/build/Makefile
index 8017d776fd55..1eb539f06607 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -351,10 +351,12 @@ MSDOSFSINCS+=	${SRCTOP}/sys/fs/msdosfs/fat.h
 MSDOSFSINCS+=	${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h
 DISKINCS+=	${SRCTOP}/sys/sys/disk/bsd.h
 
+.if ${.MAKE.OS} == "FreeBSD"
 # Needed to build most of the things below, which include sys/cdefs.h either
 # directly or transitively
 SYSINCS+=	${SRCTOP}/sys/sys/_visible.h
 SYSINCS+=	${SRCTOP}/sys/sys/cdefs.h
+.endif
 
 # Needed to build config (since it uses libnv)
 SYSINCS+=	${SRCTOP}/sys/sys/_nv.h
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6951e1d2.3d905.f3b3a4b>