LSnD4rMuQ75vZxw2 aAbCvVvRYvH+Dnp68RzLe+oc2j6ObxKDJ+F2t7Ep+sy+iAw+ltgciowzfsHmwqpMavC9Jb J9FlWruhSoT/KzWaJ0papyvhvVNR/IhKiaTSKpELVKObOT/ToeJBwIApYTdzlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822748; 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=I3nGwajSZdUrSAq87ygN2pZDfIuj4RuE/MBmtvlTR8E=; b=cH7kgf2rbJpV4xIWNGfLfQc4/kBm0KQEnaljcfgDM2EDOriLozYsqaRax7ua+IyyVBMBuP Sz2KZk/zEvl4z/taqTTKQ6uhh1qzDwiPPGeMV3NB44b2kVOVm+WJBF8ca/PCvtM0L5DXYI hQjjrIsSZjGagLhiq7A6MQP5X8PH6f0Ro1KCzP41iv6M87AcPrNiZZRN4AUnq8tMG2h7y2 mqmTlafdBpJ45zpIXbQfsfucrhd8vnP5m19XMWtP3KIB19DGGM+rgbQeVR6xOnyHBX6FRQ c2S463toRxXF/ceVeROCQrKkSYQ0VHKmYnhXrQKbrUzFWZbMIqaR1hP0lYdrHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765822748; a=rsa-sha256; cv=none; b=o+VbvWg41qhY+1obasYOtnS4fE1PgWigzq6SUVNLs+N11SlqELFQ1w1i42Lo+0WuOEK3pH Pw2/LMsIhSdzgUPV+xOebUcgfxILLk6pLDi5bAnQjlol1cZLpOEfDFRUIAyap6St21zt7J 3moW8UxWEXJJROLwo65ePDWhv6nb6lNxwAfpXd9fgZskea4DxQ5Nw6R+HePSGxX2f3MmJX Y8U9R1WL+25CTacmmp3zGSiGyNnGMsQDsndiBqwZgOnwyG+ujSP0K+uQIjvisSZm5xwkgZ Do69RRh9Tx2dilemCxBOL74wRk05ITc6+B0+NpFX7iuFhJotm0hHaDaRdoB18w== 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 4dVSxm1ddzzVcy for ; Mon, 15 Dec 2025 18:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 235cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 18:19:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Jessica Clarke Subject: git: 4aa306667080 - stable/13 - cross-build: Workaround system-provided strchrnul on macOS 15.4+ List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4aa306667080dc2dc77ecbb146eccb081f9e63b2 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 18:19:08 +0000 Message-Id: <6940511c.235cc.4d9dcae4@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=4aa306667080dc2dc77ecbb146eccb081f9e63b2 commit 4aa306667080dc2dc77ecbb146eccb081f9e63b2 Author: John Baldwin AuthorDate: 2025-04-28 17:10:41 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 17:56:37 +0000 cross-build: Workaround system-provided strchrnul on macOS 15.4+ macOS added a native strchrnul in 15.4. There is not an easy way to detect it at compile time, so use a macro to rename our local inline version to avoid conflicts while also forcing its use during bootstrap. The local version can be removed once macOS versions older than 15.4 are no longer supported as build hosts. Co-authored by: jrtc27 Reported by: kib Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D49893 (cherry picked from commit 4e2616b74cb7eed921aa10fb776cdc2d5fd4e42f) --- tools/build/cross-build/include/mac/string.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/build/cross-build/include/mac/string.h b/tools/build/cross-build/include/mac/string.h index d7db0d3023a4..58464f1f9834 100644 --- a/tools/build/cross-build/include/mac/string.h +++ b/tools/build/cross-build/include/mac/string.h @@ -38,9 +38,12 @@ #include_next /* - * strchrnul is not provided by macOS and the strchrnul.c implementation - * can not be compiled on macOS so just provide it inline here + * strchrnul is provided by macOS 15.4 and later. However, there is + * no good way to detect the current host version at compile time, so + * provide an inline definition under an alternate name. */ +#define strchrnul(p, ch) __freebsd_strchrnul(p, ch) + static inline char * strchrnul(const char *p, int ch) {