scons: make RUBY a regular (non-global) sticky var

and force it to True for builds that imply Ruby protocols
(else unexpected things happen when testing these builds
with RUBY=False).

diff --git a/SConstruct b/SConstruct
index 55cf71876a79909cacf248b81b6e383d45e7d15e..275a3c5d59245e800f6fec34c1c1febff9231f5d 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -314,7 +314,6 @@ global_sticky_vars.AddVariables(
     ('BATCH_CMD', 'Batch pool submission command name', 'qdo'),
     ('EXTRAS', 'Add Extra directories to the compilation', '',
      PathListAllExist, PathListMakeAbsolute),
-    BoolVariable('RUBY', 'Build with Ruby', False),
     )
 
 # base help text
@@ -688,6 +687,7 @@ sticky_vars.AddVariables(
     BoolVariable('USE_FENV', 'Use <fenv.h> IEEE mode control', have_fenv),
     BoolVariable('USE_CHECKER', 'Use checker for detailed CPU models', False),
     BoolVariable('CP_ANNOTATE', 'Enable critical path annotation capability', False),
+    BoolVariable('RUBY', 'Build with Ruby', False),
     )
 
 nonsticky_vars.AddVariables(

diff --git a/build_opts/ALPHA_SE_MESI_CMP_directory b/build_opts/ALPHA_SE_MESI_CMP_directory
index c55731b30c859a21b7c5efa75d32690bac0a02b6..3db3daa029978f3a8423f5bd7405a45536a59ba6 100644 (file)
--- a/build_opts/ALPHA_SE_MESI_CMP_directory
+++ b/build_opts/ALPHA_SE_MESI_CMP_directory
@@ -2,3 +2,4 @@ FULL_SYSTEM = 0
 SS_COMPATIBLE_FP = 1
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
 PROTOCOL = 'MESI_CMP_directory'
+RUBY = True

diff --git a/build_opts/ALPHA_SE_MOESI_CMP_directory b/build_opts/ALPHA_SE_MOESI_CMP_directory
index 5edc7688bd74fdb6c64568485d7c50ae763605cf..5685952af1c39742bb6a351448c2fdadce7e8d65 100644 (file)
--- a/build_opts/ALPHA_SE_MOESI_CMP_directory
+++ b/build_opts/ALPHA_SE_MOESI_CMP_directory
@@ -2,3 +2,4 @@ FULL_SYSTEM = 0
 SS_COMPATIBLE_FP = 1
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
 PROTOCOL = 'MOESI_CMP_directory'
+RUBY = True

diff --git a/build_opts/ALPHA_SE_MOESI_CMP_token b/build_opts/ALPHA_SE_MOESI_CMP_token
index f69c2c48cf1fee77466ebad6481b9f150b2fefa6..372be578d71697496212a59bdefc993010876d0b 100644 (file)
--- a/build_opts/ALPHA_SE_MOESI_CMP_token
+++ b/build_opts/ALPHA_SE_MOESI_CMP_token
@@ -2,3 +2,4 @@ FULL_SYSTEM = 0
 SS_COMPATIBLE_FP = 1
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
 PROTOCOL = 'MOESI_CMP_token'
+RUBY = True

diff --git a/build_opts/ALPHA_SE_MOESI_hammer b/build_opts/ALPHA_SE_MOESI_hammer
index f21ca5e5d13f27dcbcd4541bae905466254a7da7..23bbc07a8177e476ec9584bc9fc57b8004f8437a 100644 (file)
--- a/build_opts/ALPHA_SE_MOESI_hammer
+++ b/build_opts/ALPHA_SE_MOESI_hammer
@@ -2,3 +2,4 @@ FULL_SYSTEM = 0
 SS_COMPATIBLE_FP = 1
 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
 PROTOCOL = 'MOESI_hammer'
+RUBY = True

diff --git a/src/mem/ruby/SConsopts b/src/mem/ruby/SConsopts
index 6c934334622d7f6d11ad5146d6ace75de9a0f93f..95ca71fddc9c962bdf636bee6f44d11fe3c209b4 100644 (file)
--- a/src/mem/ruby/SConsopts
+++ b/src/mem/ruby/SConsopts
@@ -30,9 +30,6 @@
 
 Import('*')
 
-if not main['RUBY']:
-    Return()
-
 sticky_vars.AddVariables(
     BoolVariable('NO_VECTOR_BOUNDS_CHECKS', "Don't do bounds checks", True),
     BoolVariable('RUBY_DEBUG', "Add debugging stuff to Ruby", False),