[buildbot] phase1: remove GetCC()/GetCXX()
LEDE Commits
lede-commits at lists.infradead.org
Mon May 15 08:38:58 PDT 2023
ynezz pushed a commit to buildbot.git, branch master:
https://git.openwrt.org/a2fd09ab4b4e0562a67c6517b54892f580e0e23e
commit a2fd09ab4b4e0562a67c6517b54892f580e0e23e
Author: Thibaut VARÈNE <hacks at slashdirt.org>
AuthorDate: Thu Oct 20 11:37:21 2022 +0200
phase1: remove GetCC()/GetCXX()
Signed-off-by: Thibaut VARÈNE <hacks at slashdirt.org>
---
phase1/master.cfg | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
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"
- at properties.renderer
-def GetCC(props):
- if props.hasProperty("cc_command"):
- return props["cc_command"]
- else:
- return "gcc"
-
- at 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")
More information about the lede-commits
mailing list