Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Jul 2021 19:37:02 GMT
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6b641f4eb46b - main - Mk: Document and simply user-modifiable ccache vars
Message-ID:  <202107121937.16CJb2Ov017396@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bdrewery:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6b641f4eb46bba486b2664d0c9ffd992d035cd2a

commit 6b641f4eb46bba486b2664d0c9ffd992d035cd2a
Author:     Bryan Drewery <bdrewery@FreeBSD.org>
AuthorDate: 2021-07-12 19:35:58 +0000
Commit:     Bryan Drewery <bdrewery@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107121937.16CJb2Ov017396>