From owner-dev-commits-ports-all@freebsd.org Mon Jul 12 19:44:03 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 4EDD4665FA2; Mon, 12 Jul 2021 19:44:03 +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 4GNvN31Qylz3hTx; Mon, 12 Jul 2021 19:44:03 +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 16B6214BC9; Mon, 12 Jul 2021 19:44:03 +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 16CJi2jq030455; Mon, 12 Jul 2021 19:44:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16CJi2kW030454; Mon, 12 Jul 2021 19:44:02 GMT (envelope-from git) Date: Mon, 12 Jul 2021 19:44:02 GMT Message-Id: <202107121944.16CJi2kW030454@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: 6b37107bea26 - main - Mk/bsd.ccache.mk: Use CCACHE_BIN in BUILD_DEPENDS 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: 6b37107bea260ec0493017e6c69339f8fa62dc9f 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:44:03 -0000 The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b37107bea260ec0493017e6c69339f8fa62dc9f commit 6b37107bea260ec0493017e6c69339f8fa62dc9f Author: Bryan Drewery AuthorDate: 2021-07-12 19:43:28 +0000 Commit: Bryan Drewery 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}