From 1b49c56679b18b068e04cfe074bf984897fe656b Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Tue, 2 Aug 2011 00:10:08 -0500 Subject: Scons: Drop RUBY as compile time option. This patch drops RUBY as a compile time option. Instead the PROTOCOL option is used to figure out whether or not to build Ruby. If the specified protocol is 'None', then Ruby is not compiled. --- SConstruct | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 8c09e5e4d..6074675c8 100755 --- a/SConstruct +++ b/SConstruct @@ -810,7 +810,6 @@ sticky_vars.AddVariables( BoolVariable('USE_FENV', 'Use 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), ) # These variables get exported to #defines in config/*.hh (see src/SConscript). @@ -985,6 +984,11 @@ 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.) -- cgit v1.2.3