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@slashdirt.org>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 2f4337f72559e9e163f59eefd805a9fc50396d62..945533fe9d4883ee0a3701b49e10ad619edd9e44 100644 (file)
--- 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']