The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b775479ca2c4fa286562e184a2cb9329448f33e5
commit b775479ca2c4fa286562e184a2cb9329448f33e5 Author: Dag-Erling Smørgrav <[email protected]> AuthorDate: 2026-07-02 15:16:52 +0000 Commit: Dag-Erling Smørgrav <[email protected]> CommitDate: 2026-07-13 07:30:06 +0000 src.conf(5): Suggest using ccache4 We have separate ports for Ccache 3 and 4. Suggest both, rather than only the Ccache 3 port. Rearrange the text somewhat to avoid an excessively ragged edge on a standard 80-column terminal. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D58005 (cherry picked from commit a2545f68f64b4cfcc13ca2d372c8b9fef1c6331e) --- share/man/man5/src.conf.5 | 19 ++++++++----------- tools/build/options/WITH_CCACHE_BUILD | 17 +++++++---------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 2ec7862b1a21..cc1b58d28f5d 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd June 26, 2026 +.Dd July 13, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -348,22 +348,19 @@ Use .Xr ccache 1 for the build. No configuration is required except to install the -.Sy devel/ccache +.Sy devel/ccache , +.Sy devel/ccache4 , or .Sy devel/sccache -package. +port or package; in the latter case, set +.Sy CCACHE_NAME=sccache . 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 +.Sy CCACHE_PREFIX=${LOCALBASE}/bin/distcc . +The default cache directory is .Pa $HOME/.ccache -will be used, which can be overridden by setting +and can be changed by setting .Sy CCACHE_DIR . The .Sy CCACHE_COMPILERCHECK diff --git a/tools/build/options/WITH_CCACHE_BUILD b/tools/build/options/WITH_CCACHE_BUILD index 9a5c2ce1cb80..f2a8505ee372 100644 --- a/tools/build/options/WITH_CCACHE_BUILD +++ b/tools/build/options/WITH_CCACHE_BUILD @@ -2,22 +2,19 @@ Use .Xr ccache 1 for the build. No configuration is required except to install the -.Sy devel/ccache +.Sy devel/ccache , +.Sy devel/ccache4 , or .Sy devel/sccache -package. +port or package; in the latter case, set +.Sy CCACHE_NAME=sccache . 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 +.Sy CCACHE_PREFIX=${LOCALBASE}/bin/distcc . +The default cache directory is .Pa $HOME/.ccache -will be used, which can be overridden by setting +and can be changed by setting .Sy CCACHE_DIR . The .Sy CCACHE_COMPILERCHECK
