From nobody Mon Dec 29 02:05:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffgQ3lswz6LVCH for ; Mon, 29 Dec 2025 02:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffgQ3H0Vz3gs7 for ; Mon, 29 Dec 2025 02:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766973906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XEKYbEW4GuynMkGT8fmgbBN9MyffzUbohv6YqVGu7w8=; b=op0qYA8Bzmlk2kyrysoBuSAcujir74/eEP7571xOC9WDCweC/liYj4F9qIOCmZJu1hnlhh gjJZ5wkw7x3iBMCLWBZ8WIcNoWAMoBG4m46y8Sh9+16nCn/WNrvvhFmCQBKRnH4TcnqO2X a+c+WhcYceN2UUO+S/tXDkex4Ssm/I224B7L+vHlaq+KFAMy7PXqqJ42dNJL8ySLA4JDjZ kwCv3WJvazXSEL4YibQhxmgyRnG2SvTv3xQOWStXoEcv0YAetfIvdQxfPtJg3S9IVDsUTM HCSol0Ip8jJG2dKqqt6aE6tcU7YSXansQONhStmma1hlaNU/BGoJOESRDhAm4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766973906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XEKYbEW4GuynMkGT8fmgbBN9MyffzUbohv6YqVGu7w8=; b=NIeSfnLbbPbuiDwEm1cDrpN5+KbzdYWSx+HTq5POcAEtps1p3dYofWRk5XGieUScSJyykI YCLs0OlUjUIBd4lHbb85lYtA1O+cFXlGyMjPZWiXCe5vtAt8O5Sb5RkOM+8Ouu9ShJhkS3 yN5rOgyVZi58hGetF00GnIRH65tcXjMbUSBB37ByFzAVwN08dwfvqo6BogQOjl9qWS2iBe hXTYNIad1DLAr9oixWcK5l0OtsC8iToZNnMoQed7XgtA4XCs8iid3W4WLSjJsDhVzIvQ0e tREEg1AZUqyLK9YFzsylTuwjwi7FTAX3+u8Xtn2OzW/TsSuH0AJpmzchb2+QGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766973906; a=rsa-sha256; cv=none; b=w3zMQ+ho9qKeiSDokOpptPBr6GYpkAog9g4cXQVpU4boluRl7TQnrTnFq7XinINWx2iSJE aO779HUeEAFuCpbHTF9WEvvsJCvILmpAUXOZzwE5GZbgHZAoC158A/fvj+A5b4yCCg6xQF m37GSGHWNOzLNbFI/iU5lHuXa8OKVX1HyS4d/6nA5OyQpXvi0LHHmuDWaSbLJgQz+8EixD Jf4gu3Oc1mczaPP1B3TkezZWM27kdG4eySfVa/LsC29lTj/YFHZAM7j1fiPs38P5SKbI8J +hQaqeiv+VvgxZtOmwTUPnmmbnyuSNdKOe+YYsklV03/6Kvu1h7c2bKY1PQzmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffgQ2XZPz194H for ; Mon, 29 Dec 2025 02:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d905 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:05:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ayrton Munoz From: Dimitry Andric Subject: git: b6672803a1cf - main - cross-build: Avoid adding to SYSINCS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6672803a1cf10dd1c912fe6571a8d426b8868bd Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:05:06 +0000 Message-Id: <6951e1d2.3d905.f3b3a4b@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b6672803a1cf10dd1c912fe6571a8d426b8868bd commit b6672803a1cf10dd1c912fe6571a8d426b8868bd Author: Ayrton Munoz AuthorDate: 2025-12-29 02:02:28 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:04:45 +0000 cross-build: Avoid adding 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