From nobody Mon Dec 29 12:17:39 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 4dfwGC69kQz6MCmT for ; Mon, 29 Dec 2025 12:17:39 +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 4dfwGC3Qfyz3TXm for ; Mon, 29 Dec 2025 12:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010659; 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=edzHKlwl9B73Tf/ZSsw68K7gIDOv+hzcCZg85KNGcqU=; b=M56pyINnWkGBa7/4CfhDd+E6UG+fBimWzHSPrrUR4co/jMMQU0vgrNBcHQC0gAPu66A9wr pXQSmZTyJbb3OYIW4+Zxp2FbR9BkJVZaodU5naKexZQRrRTWzZl0OWwk/eyKHGTDf+vrot MMUZ8QLYOtGevVCNoysd41JFzmxye9B2oJcIIc11Tmt65p899vuA9ZrtgL449xCRv9vi1D iUob6iCdBmOHn4dIIFQKETSN1Frb8yjRbz3gTiB3+/XKlynpXmawiNkRxfv2o888Jh1uyl 2ATBz0DPg+yCSbdxf53RBt4tkgr+SVd8PZ/zKg6KzbS4I3e1wmgx8Rw/0/a0og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767010659; 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=edzHKlwl9B73Tf/ZSsw68K7gIDOv+hzcCZg85KNGcqU=; b=oiEMSyYyVwAieYebdn3n+ag+cWCZQp9B64V0WplPYt8sWS2EX0vT0Jetr3vzHkOyWb1FS/ VuIIprRXz2DJrWNj16yh1Ou69shGmo9kqIr/jqsnQN9MzzzmDDLZ19w+AyGxPV5hmUgpeq pJqcg33h5+VkWGlr3Nua0nx7X0PoyUZmg7tGwH4xYQ99KXJs+QOiVyJKDSaRespbQL8njh TvB8dHPNhuwVIfGDEIIPxS73GK3mz48tKQS9su5v3i58ilJn1289r+y1AOyoOE46YtyC1T EFggVkHkvju5B53So33St7UzYEeQjzt5SLOHssWOlq54TY+5hBZEUMMedKqC9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767010659; a=rsa-sha256; cv=none; b=Y/Z9WoQUol3lzLInztq7dcIAOXMBcPL/2djJJC/IdRHSLCbppUoHPk1Fl56LeZxNvsvpW3 xP20WzQN3nT+IgW9He98WNqQxucRxHeE8apcnUjr8rold43FvcuQOavwLNc8n/cMZBUO6d wpD10itElyc3xQrcaHdpryHprmr10Rw65k5y2ov2ypMS4nwKEePJQByi/KVD9ICkBhYF2z ULwU8iCm3E92Do6JZYNcQQ91iVo6ZUifleFdhL82fEA0DRPMVH0tB2vJxtpqkRlS9d6dWT PMxCpcveDRVDJRBI+5V0Y+Ts0mrGuElAcD39Q16Bcl75d+HdYj5oLwhLDqJ5Ng== 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 4dfwGC2jQpz1c for ; Mon, 29 Dec 2025 12:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3204d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 12:17:39 +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: 248f879133bf - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 248f879133bfa4b916421d385afeaf2dc91fcaf3 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 12:17:39 +0000 Message-Id: <69527163.3204d.2ec84f71@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=248f879133bfa4b916421d385afeaf2dc91fcaf3 commit 248f879133bfa4b916421d385afeaf2dc91fcaf3 Author: Ayrton Munoz AuthorDate: 2025-12-29 02:02:28 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 12:15:14 +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 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.h