From owner-dev-commits-ports-all@freebsd.org Mon Jul 12 19:37:02 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E8731665A38; Mon, 12 Jul 2021 19:37:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GNvCy5tlbz3QrP; Mon, 12 Jul 2021 19:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 ACC01147BB; Mon, 12 Jul 2021 19:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16CJb2As017397; Mon, 12 Jul 2021 19:37:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16CJb2Ov017396; Mon, 12 Jul 2021 19:37:02 GMT (envelope-from git) Date: Mon, 12 Jul 2021 19:37:02 GMT Message-Id: <202107121937.16CJb2Ov017396@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: 6b641f4eb46b - main - Mk: Document and simply user-modifiable ccache vars MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b641f4eb46bba486b2664d0c9ffd992d035cd2a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2021 19:37:03 -0000 The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b641f4eb46bba486b2664d0c9ffd992d035cd2a commit 6b641f4eb46bba486b2664d0c9ffd992d035cd2a Author: Bryan Drewery AuthorDate: 2021-07-12 19:35:58 +0000 Commit: Bryan Drewery CommitDate: 2021-07-12 19:35:58 +0000 Mk: Document and simply user-modifiable ccache vars PR: 242944 --- Mk/bsd.ccache.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Mk/bsd.ccache.mk b/Mk/bsd.ccache.mk index 94badb01174c..0cfdd7b594bb 100644 --- a/Mk/bsd.ccache.mk +++ b/Mk/bsd.ccache.mk @@ -3,7 +3,8 @@ # # WITH_CCACHE_BUILD=yes enables depending on ccache and using it in the build. # NO_CCACHE_DEPEND will additionally not add the dependency on ccache. -# NO_CCACHE will disable this entirely. +# NO_CCACHE will disable using ccache entirely. +# CCACHE_PREFIX is where ccache is already installed. Default: LOCALBASE COMMANDS_Include_MAINTAINER= portmgr@FreeBSD.org @@ -36,8 +37,9 @@ WARNING+= WITH_CCACHE_BUILD support disabled, please set CCACHE_DIR. BUILD_DEPENDS+= ${LOCALBASE}/bin/ccache:devel/ccache . endif -CCACHE_WRAPPER_PATH?= ${LOCALBASE}/libexec/ccache -CCACHE_BIN?= ${CCACHE_WRAPPER_PATH:C,/libexec/ccache$,,}/bin/ccache +CCACHE_PREFIX?= ${LOCALBASE} +CCACHE_WRAPPER_PATH?= ${CCACHE_PREFIX}/libexec/ccache +CCACHE_BIN?= ${CCACHE_PREFIX}/bin/ccache .if exists(${CCACHE_WRAPPER_PATH}) # Prepend the ccache dir into the PATH and setup ccache env