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 --- src/SConscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/SConscript b/src/SConscript index 155dcf53d..ed59bd228 100755 --- a/src/SConscript +++ b/src/SConscript @@ -1233,9 +1233,9 @@ env.Append(BUILDERS = {'MakeEnvirons' : Builder(action=MakeAction(makeEnvirons, Transform("ENVIRONS", 1)))}) -isa_target = env['PHONY_BASE'] + '-deps' -environs = env['PHONY_BASE'] + '-environs' -env.Depends('#all-deps', isa_target) +isa_target = '#${VARIANT_NAME}-deps' +environs = '#${VARIANT_NAME}-environs' +env.Depends('#all-deps', isa_target) env.Depends('#all-environs', environs) env.ScanISA(isa_target, File('arch/%s/generated/inc.d' % env['TARGET_ISA'])) envSetup = env.MakeEnvirons(environs, isa_target) -- cgit v1.2.3