From 83c5f0fa0a2a01ab39449c4b68b078132787e9f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Thu, 20 Oct 2022 11:33:10 +0200 Subject: [PATCH] phase1: remove GetCwd() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index 38df7f5..7698f00 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -475,15 +475,6 @@ def GetCXX(props): else: return "g++" -@properties.renderer -def GetCwd(props): - if props.hasProperty("builddir"): - return props["builddir"] - elif props.hasProperty("workdir"): - return props["workdir"] - else: - return "/" - @properties.renderer def GetCCache(props): if props.hasProperty("ccache_command") and "ccache" in props["ccache_command"]: @@ -506,8 +497,8 @@ def MakeEnv(overrides=None, tryccache=False): 'CCXX': Interpolate("%(kw:cxx)s", cxx=GetCXX), } if tryccache: - env['CC'] = Interpolate("%(kw:cwd)s/ccache_cc.sh", cwd=GetCwd) - env['CXX'] = Interpolate("%(kw:cwd)s/ccache_cxx.sh", cwd=GetCwd) + 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) else: env['CC'] = env['CCC'] @@ -937,7 +928,7 @@ for target in targets: property = "kernelversion", description = "Finding the effective Kernel version", command = "make --no-print-directory -C target/linux/ val.LINUX_VERSION val.LINUX_RELEASE val.LINUX_VERMAGIC | xargs printf '%s-%s-%s\\n'", - env = { 'TOPDIR': Interpolate("%(kw:cwd)s/build", cwd=GetCwd) } + env = { 'TOPDIR': Interpolate("%(prop:builddir)s/build") } )) factory.addStep(ShellCommand( -- 2.30.2