From b0489d18ed74b542e311a2a7238cd5e19bd4b2ab Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Tue, 21 Apr 2009 08:17:36 -0700 Subject: SCons: Export export_vars so SConsopts files can add to them --- SConstruct | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 1c7f09515..baa4864a9 100644 --- a/SConstruct +++ b/SConstruct @@ -654,6 +654,10 @@ Export('all_cpu_list', 'default_cpus') sticky_vars = Variables(args=ARGUMENTS) Export('sticky_vars') +# Sticky variables that should be exported +export_vars = [] +Export('export_vars') + # Non-sticky variables only apply to the current build. nonsticky_vars = Variables(args=ARGUMENTS) Export('nonsticky_vars') @@ -698,10 +702,9 @@ nonsticky_vars.AddVariables( ) # These variables get exported to #defines in config/*.hh (see src/SConscript). -env.ExportVariables = ['FULL_SYSTEM', 'USE_FENV', \ - 'USE_MYSQL', 'NO_FAST_ALLOC', 'FAST_ALLOC_DEBUG', \ - 'FAST_ALLOC_STATS', 'SS_COMPATIBLE_FP', \ - 'USE_CHECKER', 'TARGET_ISA', 'CP_ANNOTATE'] +export_vars += ['FULL_SYSTEM', 'USE_FENV', 'USE_MYSQL', + 'NO_FAST_ALLOC', 'FAST_ALLOC_DEBUG', 'FAST_ALLOC_STATS', + 'SS_COMPATIBLE_FP', 'USE_CHECKER', 'TARGET_ISA', 'CP_ANNOTATE'] ################################################### # -- cgit v1.2.3