summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@gmail.com>2010-06-07 12:19:59 -0400
committerSteve Reinhardt <stever@gmail.com>2010-06-07 12:19:59 -0400
commit4977d8b58ffe72fe679767d44b166bf909fdc3c1 (patch)
tree598217132de5f76b75562d349a824b82b17c4d0f
parent744b59d6de45d846871cd80338f0299bb0bb3b2a (diff)
downloadgem5-4977d8b58ffe72fe679767d44b166bf909fdc3c1.tar.xz
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).
-rw-r--r--SConstruct2
-rw-r--r--build_opts/ALPHA_SE_MESI_CMP_directory1
-rw-r--r--build_opts/ALPHA_SE_MOESI_CMP_directory1
-rw-r--r--build_opts/ALPHA_SE_MOESI_CMP_token1
-rw-r--r--build_opts/ALPHA_SE_MOESI_hammer1
-rw-r--r--src/mem/ruby/SConsopts3
6 files changed, 5 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 55cf71876..275a3c5d5 100644
--- 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 c55731b30..3db3daa02 100644
--- 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 5edc7688b..5685952af 100644
--- 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 f69c2c48c..372be578d 100644
--- 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 f21ca5e5d..23bbc07a8 100644
--- 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 6c9343346..95ca71fdd 100644
--- 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),