[gem5-dev] Change in public/gem5[master]: scons: Get rid of the all_isa_deps variable.

[Gabe Black (Gerrit)]

Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/2982

Change subject: scons: Get rid of the all_isa_deps variable.
......................................................................

scons: Get rid of the all_isa_deps variable.

This value can be computed more directly and more locally near where it's
used.

Change-Id: Ib5f45015494a6c8033ce0ac4b8931688f37492c8
---
M SConstruct
1 file changed, 3 insertions(+), 5 deletions(-)



diff --git a/SConstruct b/SConstruct
index 943862d..64f08b6 100755
--- a/SConstruct
+++ b/SConstruct
@@ -1389,7 +1389,6 @@

 main['ALL_ISA_LIST'] = all_isa_list
 main['ALL_GPU_ISA_LIST'] = all_gpu_isa_list
-all_isa_deps = {}
 def make_switching_dir(dname, switch_headers, env):
     # Generate the header.  target[0] is the full path of the output
     # header to generate.  'source' is a dummy variable, since we get the
@@ -1415,9 +1414,6 @@
     for hdr in switch_headers:
         env.Command(hdr, [], switch_hdr_action)

-    isa_target = Dir('.').up().name.lower().replace('_', '-')
-    all_isa_deps[isa_target] = None
-
 Export('make_switching_dir')

 def make_gpu_switching_dir(dname, switch_headers, env):
@@ -1593,6 +1589,8 @@
     b.next()
     return itertools.izip(a, b)

+variant_names = [variant_name(path) for path in variant_paths]
+
 # Create false dependencies so SCons will parse ISAs, establish
 # dependencies, and setup the build Environments serially. Either
 # SCons (likely) and/or our SConscripts (possibly) cannot cope with -j
@@ -1601,7 +1599,7 @@
 # Every time I tried to remove this, builds would fail in some
 # creative new way. So, don't do that. You'll want to, though, because
 # tests/SConscript takes a long time to make its Environments.
-for t1, t2 in pairwise(sorted(all_isa_deps.iterkeys())):
+for t1, t2 in pairwise(sorted(variant_names)):
     main.Depends('#%s-deps'     % t2, '#%s-deps'     % t1)
     main.Depends('#%s-environs' % t2, '#%s-environs' % t1)


--
To view, visit https://gem5-review.googlesource.com/2982
To unsubscribe, visit https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5f45015494a6c8033ce0ac4b8931688f37492c8
Gerrit-Change-Number: 2982
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabebl...@google.com>
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev