diff options
24 files changed, 23 insertions, 28 deletions
diff --git a/SConstruct b/SConstruct index 5699cda73..06e1c3f16 100755 --- a/SConstruct +++ b/SConstruct @@ -979,11 +979,6 @@ for variant_path in variant_paths: if env['USE_SSE2']: env.Append(CCFLAGS=['-msse2']) - if env['PROTOCOL'] != 'None': - env['RUBY'] = True - else: - env['RUBY'] = False - # The src/SConscript file sets up the build rules in 'env' according # to the configured variables. It returns a list of environments, # one for each variant build (debug, opt, etc.) diff --git a/src/cpu/testers/directedtest/SConscript b/src/cpu/testers/directedtest/SConscript index a321a404c..01e778fd5 100644 --- a/src/cpu/testers/directedtest/SConscript +++ b/src/cpu/testers/directedtest/SConscript @@ -35,7 +35,7 @@ Import('*') # When this dependency is removed, the ruby tester should be compiled # independently from Ruby # -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() SimObject('RubyDirectedTester.py') diff --git a/src/cpu/testers/rubytest/SConscript b/src/cpu/testers/rubytest/SConscript index 1b65932e7..70a4f480d 100644 --- a/src/cpu/testers/rubytest/SConscript +++ b/src/cpu/testers/rubytest/SConscript @@ -35,7 +35,7 @@ Import('*') # When this dependency is removed, the ruby tester should be compiled # independently from Ruby # -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() SimObject('RubyTester.py') diff --git a/src/mem/protocol/SConscript b/src/mem/protocol/SConscript index a4e2a5264..e7efe8b1c 100644 --- a/src/mem/protocol/SConscript +++ b/src/mem/protocol/SConscript @@ -38,7 +38,7 @@ from SCons.Scanner import Classic Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() protocol_dir = Dir('.') diff --git a/src/mem/ruby/SConscript b/src/mem/ruby/SConscript index d52383d09..64dd83bb0 100644 --- a/src/mem/ruby/SConscript +++ b/src/mem/ruby/SConscript @@ -40,7 +40,7 @@ Import('*') if env['TARGET_ISA'] == 'no': Return() -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() def do_embed_text(target, source, env): diff --git a/src/mem/ruby/buffers/SConscript b/src/mem/ruby/buffers/SConscript index 2608d5e23..ff0b5e9bc 100644 --- a/src/mem/ruby/buffers/SConscript +++ b/src/mem/ruby/buffers/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() Source('MessageBuffer.cc') diff --git a/src/mem/ruby/common/SConscript b/src/mem/ruby/common/SConscript index 4184b4b5f..8c2442c00 100644 --- a/src/mem/ruby/common/SConscript +++ b/src/mem/ruby/common/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() Source('Address.cc') diff --git a/src/mem/ruby/eventqueue/SConscript b/src/mem/ruby/eventqueue/SConscript index 0312df4e4..a74d53139 100644 --- a/src/mem/ruby/eventqueue/SConscript +++ b/src/mem/ruby/eventqueue/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() Source('RubyEventQueue.cc') diff --git a/src/mem/ruby/filters/SConscript b/src/mem/ruby/filters/SConscript index ac03aaf36..adfe214c0 100644 --- a/src/mem/ruby/filters/SConscript +++ b/src/mem/ruby/filters/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() Source('BlockBloomFilter.cc') diff --git a/src/mem/ruby/network/SConscript b/src/mem/ruby/network/SConscript index 3c3bcea06..c4abba716 100644 --- a/src/mem/ruby/network/SConscript +++ b/src/mem/ruby/network/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() SimObject('BasicLink.py') diff --git a/src/mem/ruby/network/garnet/SConscript b/src/mem/ruby/network/garnet/SConscript index 14540426f..516bdb564 100644 --- a/src/mem/ruby/network/garnet/SConscript +++ b/src/mem/ruby/network/garnet/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() SimObject('BaseGarnetNetwork.py') diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/SConscript b/src/mem/ruby/network/garnet/fixed-pipeline/SConscript index ae3b964de..0010f3d1a 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/SConscript +++ b/src/mem/ruby/network/garnet/fixed-pipeline/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() SimObject('GarnetLink_d.py') diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/SConscript b/src/mem/ruby/network/garnet/flexible-pipeline/SConscript index 03f4e3fdb..0e97f1698 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/SConscript +++ b/src/mem/ruby/network/garnet/flexible-pipeline/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() SimObject('GarnetLink.py') diff --git a/src/mem/ruby/network/orion/Allocator/SConscript b/src/mem/ruby/network/orion/Allocator/SConscript index eede26a79..e85844bac 100644 --- a/src/mem/ruby/network/orion/Allocator/SConscript +++ b/src/mem/ruby/network/orion/Allocator/SConscript @@ -28,7 +28,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() Source('Arbiter.cc') diff --git a/src/mem/ruby/network/orion/Buffer/SConscript b/src/mem/ruby/network/orion/Buffer/SConscript index 3db8c4a01..20e528c09 100644 --- a/src/mem/ruby/network/orion/Buffer/SConscript +++ b/src/mem/ruby/network/orion/Buffer/SConscript @@ -28,7 +28,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() Source('AmpUnit.cc') diff --git a/src/mem/ruby/network/orion/Crossbar/SConscript b/src/mem/ruby/network/orion/Crossbar/SConscript index 76774da1b..710046978 100644 --- a/src/mem/ruby/network/orion/Crossbar/SConscript +++ b/src/mem/ruby/network/orion/Crossbar/SConscript @@ -28,7 +28,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() Source('Crossbar.cc') diff --git a/src/mem/ruby/network/orion/SConscript b/src/mem/ruby/network/orion/SConscript index 8a6383bfb..4a0e8fa96 100644 --- a/src/mem/ruby/network/orion/SConscript +++ b/src/mem/ruby/network/orion/SConscript @@ -27,7 +27,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() Source('NetworkPower.cc') diff --git a/src/mem/ruby/network/simple/SConscript b/src/mem/ruby/network/simple/SConscript index 6bd836784..14d354b65 100644 --- a/src/mem/ruby/network/simple/SConscript +++ b/src/mem/ruby/network/simple/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() SimObject('SimpleLink.py') diff --git a/src/mem/ruby/network/topologies/SConscript b/src/mem/ruby/network/topologies/SConscript index 0a2ba1b46..a3c41a6d3 100644 --- a/src/mem/ruby/network/topologies/SConscript +++ b/src/mem/ruby/network/topologies/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() PySource('', 'Crossbar.py') diff --git a/src/mem/ruby/profiler/SConscript b/src/mem/ruby/profiler/SConscript index 121a360c9..70082ad03 100644 --- a/src/mem/ruby/profiler/SConscript +++ b/src/mem/ruby/profiler/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() SimObject('Profiler.py') diff --git a/src/mem/ruby/recorder/SConscript b/src/mem/ruby/recorder/SConscript index ef4f4ef05..035f896a4 100644 --- a/src/mem/ruby/recorder/SConscript +++ b/src/mem/ruby/recorder/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() SimObject('Tracer.py') diff --git a/src/mem/ruby/slicc_interface/SConscript b/src/mem/ruby/slicc_interface/SConscript index 0fbdc1789..b51747b64 100644 --- a/src/mem/ruby/slicc_interface/SConscript +++ b/src/mem/ruby/slicc_interface/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() SimObject('Controller.py') diff --git a/src/mem/ruby/system/SConscript b/src/mem/ruby/system/SConscript index f1e7c425c..4cf0b31ad 100644 --- a/src/mem/ruby/system/SConscript +++ b/src/mem/ruby/system/SConscript @@ -30,7 +30,7 @@ Import('*') -if not env['RUBY']: +if env['PROTOCOL'] == 'None': Return() SimObject('Cache.py') diff --git a/tests/SConscript b/tests/SConscript index 58a959669..58c21e0f3 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -288,7 +288,7 @@ else: 'simple-atomic-mp', 'simple-timing-mp', 'o3-timing-mp', 'inorder-timing', 'rubytest'] -if env['RUBY']: +if env['PROTOCOL'] != 'None': if env['PROTOCOL'] == 'MI_example': configs += [c + "-ruby" for c in configs] else: |