phase1: remove GetCC()/GetCXX()

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 7698f00533279d0dbb9c125e19657d4dc75f7e1a..43e1b298b6cd60332f645710a9a451a612e9500b 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -461,20 +461,6 @@ def GetNumJobs(props):
        else:
                return "1"
 
-@properties.renderer
-def GetCC(props):
-       if props.hasProperty("cc_command"):
-               return props["cc_command"]
-       else:
-               return "gcc"
-
-@properties.renderer
-def GetCXX(props):
-       if props.hasProperty("cxx_command"):
-               return props["cxx_command"]
-       else:
-               return "g++"
-
 @properties.renderer
 def GetCCache(props):
        if props.hasProperty("ccache_command") and "ccache" in props["ccache_command"]:
@@ -493,8 +479,8 @@ def GetNextBuild(builder, requests):
 
 def MakeEnv(overrides=None, tryccache=False):
        env = {
-               'CCC': Interpolate("%(kw:cc)s", cc=GetCC),
-               'CCXX': Interpolate("%(kw:cxx)s", cxx=GetCXX),
+               'CCC': Interpolate("%(prop:cc_command:-gcc)s"),
+               'CCXX': Interpolate("%(prop:cxx_command:-g++)s"),
        }
        if tryccache:
                env['CC'] = Interpolate("%(prop:builddir)s/ccache_cc.sh")