From: Thibaut VARÈNE <hacks@slashdirt.org>
Date: Thu, 20 Oct 2022 09:37:21 +0000 (+0200)
Subject: phase1: remove GetCC()/GetCXX()
X-Git-Tag: v2~57
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a2fd09ab4b4e0562a67c6517b54892f580e0e23e;p=buildbot.git

phase1: remove GetCC()/GetCXX()

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

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 7698f00..43e1b29 100644
--- 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")