From nobody Mon Jul 13 07:39:21 2026 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 4gzDpf1vp7z6kX3X for ; Mon, 13 Jul 2026 07:39:22 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gzDpf0w3lz3tQp for ; Mon, 13 Jul 2026 07:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783928362; 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=zTyh/Eei5iwYBsEJIhifL84o+SccRbNGM3UluvETaig=; b=p8Kmx9KmAi6Tb8WUjg+dLWT8JjfYV24wCHG3LnTfmmirlneVit3Xoxfo2HM7KPAAE/y6ri qT2TdM6FPl8fN74z362OlBSWybKR/3Za+698BcBJEoKATwiqHATnMtwJ7D+3uMdYK55e6b EHlfbpRwVTD2yzSwXx8iKjSn6ipD61YUHX3GXOuLmGx6t4mB1vqOZkRDA6MWnMgeUrenNM IX2wudPzPjYp7FCYwb4d4luxZvGhjCqobmmjRb6YM/HwCNTQE7jzANO83ICuVNl1fQnQW1 r8bzDBBDQ/odNs/qJFyWnuTdGVgZlqTa6Wl9Rulf2qoWr51wjqgc0vdPrkghAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783928362; a=rsa-sha256; cv=none; b=VN+VxwwHGx/niuP9UAAp5PR+/nyuXdzGFYm1jkk72U3EveTVoEjFFe7J1UrDsKkTHcKXUs zfSYnnhkskkrsl7GXqiawZI5k8mykLszWKPRN0GDzgtNGnwk1VYmpRiMTNdJkFXdjXgDPr XFsVy2NAhWL50NG8gc3vot6plrjuPNRWlIwvd6a2lEBtyFAMcA1/PqALsf6r6aWESw6RFh ALAxRSqgZSGptDBY4Z4a1olDiftBohe/dL+RofkQXIxJ6c7lCwB/hYuVUv5juSDMSYTpyk nLysm4c9HsT4en454YUZn0/3fdv6rF4mmBoM7PEH7fkfJLoYgdX6DgkpR8ljxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783928362; 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=zTyh/Eei5iwYBsEJIhifL84o+SccRbNGM3UluvETaig=; b=OOyZRkvCV1CCHcuKPpt+iTA8qWOhLh7Y2rpCogC2xFN+wzM400TTFSvzf2HIztTU+SulZL R1zSnRRnmkAy5B1ITMF5xaHVIeO196Z6wUeRfIiUsbzuAPvlPXxPFEbA7SidyPT3z4Pw4Z CV427Emddm15UP2FZSt2fPEZhICDSz2v1N8gAzC9wDPpxzW7IGEg2ZfgMqhyBy1+z2xRbf vHdiOK8W8j2RZdVXTZlFihFmsPSM/sBspZpvfGICDzhLT04kK80yTY/MRjN7WTKISKOFYw bp9ABiFO1t4gmT+5VxfHmCiDCJPLcbPpuSM+xzh18zPnWfybS6wU53D3/TGaZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzDpd74VrzpTS for ; Mon, 13 Jul 2026 07:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25ba8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Jul 2026 07:39:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: SHENGYI HONG From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: cd2c1451dc17 - stable/14 - share/mk: Add sccache suport for WITH_CCACHE_BUILD option 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cd2c1451dc17520fc2cb8939fa8d8b1d3f9508e8 Auto-Submitted: auto-generated Date: Mon, 13 Jul 2026 07:39:21 +0000 Message-Id: <6a549629.25ba8.23a2aced@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cd2c1451dc17520fc2cb8939fa8d8b1d3f9508e8 commit cd2c1451dc17520fc2cb8939fa8d8b1d3f9508e8 Author: SHENGYI HONG AuthorDate: 2025-06-20 05:37:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-13 07:29:11 +0000 share/mk: Add sccache suport for WITH_CCACHE_BUILD option By setting CCACHE_NAME=sccache , sccache can be used as an alternative for ccache. Reviewed by: emaste, jhb Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49417 (cherry picked from commit 10cb3979a9bde6c8e441e3ba4aa5fd09963c484f) --- share/mk/bsd.compiler.mk | 12 +++++++++++- tools/build/options/WITH_CCACHE_BUILD | 7 +++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk index fd236b2e6b8f..b6a9a3586cc9 100644 --- a/share/mk/bsd.compiler.mk +++ b/share/mk/bsd.compiler.mk @@ -64,9 +64,10 @@ CCACHE_BUILD_TYPE?= command # PATH since it is more clear that ccache is used and avoids wasting time # for mkdep/linking/asm builds. LOCALBASE?= /usr/local +CCACHE_NAME?= ccache CCACHE_PKG_PREFIX?= ${LOCALBASE} CCACHE_WRAPPER_PATH?= ${CCACHE_PKG_PREFIX}/libexec/ccache -CCACHE_BIN?= ${CCACHE_PKG_PREFIX}/bin/ccache +CCACHE_BIN?= ${CCACHE_PKG_PREFIX}/bin/${CCACHE_NAME} .if exists(${CCACHE_BIN}) # Export to ensure sub-makes can filter it out for mkdep/linking and # to chain down into kernel build which won't include this file. @@ -120,7 +121,12 @@ CCACHE_NOCPP2= 1 .endif # Canonicalize CCACHE_DIR for meta mode usage. .if !defined(CCACHE_DIR) +.if !empty(CCACHE_BIN:M*sccache) +# Get the temp directory and remove beginning and trailing \" +CCACHE_DIR!= ${CCACHE_BIN} -s | awk '$$2 == "location" && $$3 == "Local" {print substr($$5, 2, length($$5) - 2)}' +.else CCACHE_DIR!= ${CCACHE_BIN} -p | awk '$$2 == "cache_dir" {print $$4}' +.endif .export CCACHE_DIR .endif .if !empty(CCACHE_DIR) && empty(.MAKE.META.IGNORE_PATHS:M${CCACHE_DIR}) @@ -132,7 +138,11 @@ CCACHE_DIR:= ${CCACHE_DIR:tA} # comparisons. .MAKE.META.IGNORE_PATHS+= ${CCACHE_BIN} ccache-print-options: .PHONY +.if !empty(CCACHE_BIN:M*sccache) + @${CCACHE_BIN} -s +.else @${CCACHE_BIN} -p +.endif # !empty(CCACHE_BIN:M*sccache) .endif # exists(${CCACHE_BIN}) .endif # ${MK_CCACHE_BUILD} == "yes" diff --git a/tools/build/options/WITH_CCACHE_BUILD b/tools/build/options/WITH_CCACHE_BUILD index 9e53769287e5..9a5c2ce1cb80 100644 --- a/tools/build/options/WITH_CCACHE_BUILD +++ b/tools/build/options/WITH_CCACHE_BUILD @@ -3,11 +3,18 @@ Use for the build. No configuration is required except to install the .Sy devel/ccache +or +.Sy devel/sccache package. When using with .Xr distcc 1 , set .Sy CCACHE_PREFIX=/usr/local/bin/distcc . +When using with sccache +set +.Sy CCACHE_NAME=sccache +in +.Xr src.conf 5 . The default cache directory of .Pa $HOME/.ccache will be used, which can be overridden by setting