From nobody Fri Jun 20 05:45:20 2025 X-Original-To: dev-commits-src-main@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 4bNmf84jG3z5yY4r; Fri, 20 Jun 2025 05:45:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bNmf842GMz3mLV; Fri, 20 Jun 2025 05:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750398320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=33YV4tJ8QZCvYXzv+OH+bF3cib+8MHyw2x+W2YIeS7o=; b=gOjvbhx3u/C5c7j/k76MPORq2P/lZykY3btmN74alCHD/ZSlLpbiLJiW7smw8DCXFALjNx DhssSNVTl/eGuypmyKqYR45VVwrhp36wBrtv8k0njasApREcMVoCPflbKpFjCBOwcP6rQG fSfM/B4eniNWKfIQUUQJUA+wGffOmXdV23CbniB2S0Ahw0aOxd72yJeQzDDoWuHjVeWHRR djDgJ/sVokvPmYo/Igpyu8bF9kXl7dceoF/MtstUsvn4SWq4Z2DdGrjjAaDqSiZwBRvmK6 0TqO21nE7jJrEPKacqUHmH5rwAM5qKJzCWKXZs3g95LuJm81KuuaSRbc/4soYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750398320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=33YV4tJ8QZCvYXzv+OH+bF3cib+8MHyw2x+W2YIeS7o=; b=LfD5UtByjjvk44MfMjxK/+FOTq1jmXjkIXWHBZG8Rgw5C6AMBc+Ml58HsPF3adyRXGZ8Xc cIY/boQPtOMwg18n0kVVCyXQaLXTILvPqj8YQJcb4puztY4SZ/Qy/JHZASQLwskiZUvGn9 TmXHgWD5HRLS2Y/tOvuHif8XSMMp5P1pG42DH9qaf98jPuADS7k90cUWqUtQPcGClLtIRT AJMkBe/nwImZCrv7tYjU13wuvX2o5PgOHt3hG9gtLEyuj70WyImkad+St++dpxSgcmEvdA NE8opJ9GnytnHDEKTZnDUCfMla7DLF/M7d0PWEr0evUtpluwADOPRYhqhJ/43A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750398320; a=rsa-sha256; cv=none; b=IG+4/932eXlqIzltZQfEJrbvjENRgRP+ZM+zya8EaEpbmnlSa1aQ5gWRlV7BlimX3mGEYU 04NjNv0FfiZRY8ZTogEsSupQL3oZ2YgZVNmca8WGwep+6TY0ZCo5DDLFgyCjaR1TatBAOu dXQewK/+DuZxqorT7CbURRRT3XMd0w++97Nwe0vNCV+etHvnzA62bWbEHPia5aZEiIC7pB wTBm/e2opOElBKSkvcQ1oEqtmN6V7O0N3AaYWgITPxuaye8K2F4jdL8VxpPRTgux0yL8SL g/JnJ3HhUZjzMRhR+Z2ZLz9n5LYyaIeAtiXrLue+2aUDgO+0QYQIKRl79wfyqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bNmf831RdzYgt; Fri, 20 Jun 2025 05:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55K5jKOK035255; Fri, 20 Jun 2025 05:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55K5jKnJ035252; Fri, 20 Jun 2025 05:45:20 GMT (envelope-from git) Date: Fri, 20 Jun 2025 05:45:20 GMT Message-Id: <202506200545.55K5jKnJ035252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 10cb3979a9bd - main - share/mk: Add sccache suport for WITH_CCACHE_BUILD option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10cb3979a9bde6c8e441e3ba4aa5fd09963c484f Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=10cb3979a9bde6c8e441e3ba4aa5fd09963c484f commit 10cb3979a9bde6c8e441e3ba4aa5fd09963c484f Author: SHENGYI HONG AuthorDate: 2025-06-20 05:37:23 +0000 Commit: Li-Wen Hsu CommitDate: 2025-06-20 05:43:48 +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 --- 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 2babccf91df1..a877b18d3b9a 100644 --- a/share/mk/bsd.compiler.mk +++ b/share/mk/bsd.compiler.mk @@ -66,9 +66,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. @@ -122,7 +123,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}) @@ -134,7 +140,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