git: 6b37107bea26 - main - Mk/bsd.ccache.mk: Use CCACHE_BIN in BUILD_DEPENDS
Bryan Drewery
bdrewery at FreeBSD.org
Mon Jul 12 19:44:03 UTC 2021
The branch main has been updated by bdrewery:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6b37107bea260ec0493017e6c69339f8fa62dc9f
commit 6b37107bea260ec0493017e6c69339f8fa62dc9f
Author: Bryan Drewery <bdrewery at FreeBSD.org>
AuthorDate: 2021-07-12 19:43:28 +0000
Commit: Bryan Drewery <bdrewery at FreeBSD.org>
CommitDate: 2021-07-12 19:43:28 +0000
Mk/bsd.ccache.mk: Use CCACHE_BIN in BUILD_DEPENDS
---
Mk/bsd.ccache.mk | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Mk/bsd.ccache.mk b/Mk/bsd.ccache.mk
index 0cfdd7b594bb..7bcb72b222af 100644
--- a/Mk/bsd.ccache.mk
+++ b/Mk/bsd.ccache.mk
@@ -31,16 +31,16 @@ WARNING+= WITH_CCACHE_BUILD support disabled, please set CCACHE_DIR.
.if !defined(NO_CCACHE) && defined(WITH_CCACHE_BUILD) && !${CC:M*ccache*} && \
!defined(NO_BUILD)
+CCACHE_PREFIX?= ${LOCALBASE}
+CCACHE_WRAPPER_PATH?= ${CCACHE_PREFIX}/libexec/ccache
+CCACHE_BIN?= ${CCACHE_PREFIX}/bin/ccache
+
# Avoid depends loops between ccache and pkg
. if !defined(NO_CCACHE_DEPEND) && \
${PKGORIGIN} != ${PKG_ORIGIN}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/ccache:devel/ccache
+BUILD_DEPENDS+= ${CCACHE_BIN}:devel/ccache
. endif
-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
PATH:= ${CCACHE_WRAPPER_PATH}:${PATH}
More information about the dev-commits-ports-all
mailing list