From 8c217ef7e480763b22c83de87c0640ea9122aba2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Thu, 20 Oct 2022 13:18:25 +0200 Subject: [PATCH] phase1: remove GetCCache() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- 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" -@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'] -- 2.30.2