From nobody Mon Dec 29 12:17:53 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 4dfwGT4kdKz6MCjy for ; Mon, 29 Dec 2025 12:17:53 +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 4dfwGT30t8z3TpB for ; Mon, 29 Dec 2025 12:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010673; 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=lTjFLzbn5J0AIV1wYvrByRCjeCq7bO1P9+SQa6no/vM=; b=vG/ZwRYm3lWUWnU0zIYaPg6czSQ78i/P/l4prS6i9GVQuQmg5f0z19OJQzLR03RLyLUVAJ 1dfCDGGTo0P6gCmBV1VAYoO05LT5khBM5Pxlr+FTY5APVzeiaT7iAyy/3v47HRJdaayh4Y pDS/jtlp1UPzWilAb31m8+piMRfJZZlV9qEasgWPItGIFIxmDngBbkUNvkz5BrgS8l6r+7 8mZ/u+IuglfTUwjfWyyRY+hqtrNX7KrZaXLQW70cd07ylDrB7kr4Lf7Ia9ii8noiKeYOW2 mZARwf0zkaSOyPkqzqddmeycm3RQpZ9ujwzv/XxoEfn5NnnD/J6CI8ZJ1phw3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010673; 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=lTjFLzbn5J0AIV1wYvrByRCjeCq7bO1P9+SQa6no/vM=; b=EkjW1wKuAo9fOKcRBQgnlvjN76Cj+QP4e9TkUSslDdegOWBxTqNuGIWCrn9YoOYSa0FU4E ioKMdmSajv1saVMimyXx2TtEjNxZrboZ+bDlZLxUerVAGcR0wBu3/TuAqKcHGUATFbL7KV QMNJNJoDdAJh5aOn9kwMVGl3hNZqxqoQOG107PnLR2M/n+kmiEcKfjqskWNDYJ0g0V+gND Vsy5ozUpcio6ueVOQZjJByGYQspdgxaXstoFBAQkMRml0SJzkYCAxoIH+HbyNeXypxMnGd ulMOMYwhUUcsbkljZUkSI8wTq15DVkwv8VQZpSF7tR8b1YT86qJOZJ2OUa4NnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010673; a=rsa-sha256; cv=none; b=YmcqEG2Yxum8TFL+D7kzUoRwM0K2C/V1P+G+kXXmEb526l/F/8aMRLTnJtN75A7vLYW7wG Vk5uVdH8PZKABVdHTAlFjx6qAYdrJP15Pte7YH3lUQurRZrRhw5Yp+Q5eYSpTUojvp1aFK YWzCmP20U4V0u8CkcuogPL1HGfZTeasFmX2ES+lg16t+Nop6Xoe2E3FKripeo8pmUwMQ8N 9bWIiVnjlXoVaY3EWuaQxE3usDzm+4OVl8CEYdFhj1t/PjiCtQf3FbBDQY+wH6hAOG3dPi veFGp1wvxPWeXxKMGTaJHI/wjx3vj0NCQdFhU8KiRdDHtRq5MqO3kUGbIEhd0Q== 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 4dfwGT2XwJz1g for ; Mon, 29 Dec 2025 12:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3094f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:17:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ayrton Munoz From: Dimitry Andric Subject: git: 9ea1aadfdb30 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9ea1aadfdb306d95e79854ca569aefc7cf993fcb Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:17:53 +0000 Message-Id: <69527171.3094f.2fa31aa3@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9ea1aadfdb306d95e79854ca569aefc7cf993fcb commit 9ea1aadfdb306d95e79854ca569aefc7cf993fcb Author: Ayrton Munoz AuthorDate: 2025-12-29 02:02:28 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:16:27 +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 (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 75b05a4e5b9c..66ac2a4f381c 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -273,9 +273,11 @@ 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/cdefs.h +.endif # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \