Date: Mon, 29 Dec 2025 12:17:39 +0000 From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ayrton Munoz <a.munoz3327@gmail.com> Subject: git: 248f879133bf - stable/15 - cross-build: Avoid adding <sys/cdefs.h> to SYSINCS Message-ID: <69527163.3204d.2ec84f71@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=248f879133bfa4b916421d385afeaf2dc91fcaf3 commit 248f879133bfa4b916421d385afeaf2dc91fcaf3 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 12:15:14 +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 (cherry picked from commit b6672803a1cf10dd1c912fe6571a8d426b8868bd) --- tools/build/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 9fcd458c370c..676d0bea0936 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -347,10 +347,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.hhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69527163.3204d.2ec84f71>