[buildbot] phase1: remove GetCCache()

LEDE Commits lede-commits at lists.infradead.org
Mon May 15 08:39:02 PDT 2023


ynezz pushed a commit to buildbot.git, branch master:
https://git.openwrt.org/8c217ef7e480763b22c83de87c0640ea9122aba2

commit 8c217ef7e480763b22c83de87c0640ea9122aba2
Author: Thibaut VARÈNE <hacks at slashdirt.org>
AuthorDate: Thu Oct 20 13:18:25 2022 +0200

    phase1: remove GetCCache()
    
    ccache_command is set from "which ccache" which is either empty or
    contains "ccache". Use a simple interpolation instead.
    
    Signed-off-by: Thibaut VARÈNE <hacks at slashdirt.org>
---
 phase1/master.cfg | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 2f4337f..945533f 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -430,13 +430,6 @@ def GetNumJobs(props):
 	else:
 		return "1"
 
- at properties.renderer
-def GetCCache(props):
-	if props.hasProperty("ccache_command") and "ccache" in props["ccache_command"]:
-		return props["ccache_command"]
-	else:
-		return ""
-
 def GetNextBuild(builder, requests):
 	for r in requests:
 		if r.properties and r.properties.hasProperty("tag"):
@@ -454,7 +447,7 @@ def MakeEnv(overrides=None, tryccache=False):
 	if tryccache:
 		env['CC'] = Interpolate("%(prop:builddir)s/ccache_cc.sh")
 		env['CXX'] = Interpolate("%(prop:builddir)s/ccache_cxx.sh")
-		env['CCACHE'] = Interpolate("%(kw:ccache)s", ccache=GetCCache)
+		env['CCACHE'] = Interpolate("%(prop:ccache_command:-)s")
 	else:
 		env['CC'] = env['CCC']
 		env['CXX'] = env['CCXX']




More information about the lede-commits mailing list