Date: Mon, 12 Jul 2021 19:44: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: 6b37107bea26 - main - Mk/bsd.ccache.mk: Use CCACHE_BIN in BUILD_DEPENDS Message-ID: <202107121944.16CJi2kW030454@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=6b37107bea260ec0493017e6c69339f8fa62dc9f commit 6b37107bea260ec0493017e6c69339f8fa62dc9f Author: Bryan Drewery <bdrewery@FreeBSD.org> AuthorDate: 2021-07-12 19:43:28 +0000 Commit: Bryan Drewery <bdrewery@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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107121944.16CJi2kW030454>