From c31b4ae223b9dbdfa22adaf877e602d6c88e42cf Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 1 May 2017 19:50:30 -0700 Subject: scons: Get rid of the PHONY_BASE construction variable. The value of that variable can be computed more directly and more locally to where it's consumed. Change-Id: I5ca1f732a34e22d4dae2aeb6ee7fc8adebe1caa0 Reviewed-on: https://gem5-review.googlesource.com/2981 Maintainer: Jason Lowe-Power Reviewed-by: Curtis Dunham Reviewed-by: Jason Lowe-Power --- SConstruct | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index d252865db..f56c23df7 100755 --- a/SConstruct +++ b/SConstruct @@ -1357,7 +1357,6 @@ def make_switching_dir(dname, switch_headers, env): env.Command(hdr, [], switch_hdr_action) isa_target = Dir('.').up().name.lower().replace('_', '-') - env['PHONY_BASE'] = '#'+isa_target all_isa_deps[isa_target] = None Export('make_switching_dir') @@ -1421,6 +1420,11 @@ BUILD_TARGETS[:] = ['#all-targets'] # ################################################### +def variant_name(path): + return os.path.basename(path).lower().replace('_', '-') +main['variant_name'] = variant_name +main['VARIANT_NAME'] = '${variant_name(BUILDDIR)}' + for variant_path in variant_paths: if not GetOption('silent'): print "Building in", variant_path -- cgit v1.2.3