summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2017-05-01 19:50:30 -0700
committerGabe Black <gabeblack@google.com>2017-05-08 22:11:13 +0000
commitc31b4ae223b9dbdfa22adaf877e602d6c88e42cf (patch)
tree6a8ea46de59061b444a5fe66b3422d8e3467bbfb /src
parenta17c9a9936a53a4cb6f60c983891dc1d797619e2 (diff)
downloadgem5-c31b4ae223b9dbdfa22adaf877e602d6c88e42cf.tar.xz
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 <jason@lowepower.com> Reviewed-by: Curtis Dunham <curtis.dunham@arm.com> Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src')
-rwxr-xr-xsrc/SConscript6
1 files changed, 3 insertions, 3 deletions
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)