diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-29 17:35:51 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-29 17:35:51 -0500 |
| commit | 1e4e989b8396b9f4f322fb27bbfa1cf9e2007334 (patch) | |
| tree | 236034318170bd70925abaecaeee398b7b9bb7e9 /build/SConstruct | |
| parent | 76daf50937abda24d46a44754e2793570fc624b4 (diff) | |
| parent | d46d3d6811822d218c137cd6d991e6b4981811d6 (diff) | |
| download | gem5-1e4e989b8396b9f4f322fb27bbfa1cf9e2007334.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 984b015700ccef71d95b4d7d775a7b3f24084dc6
Diffstat (limited to 'build/SConstruct')
| -rw-r--r-- | build/SConstruct | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/build/SConstruct b/build/SConstruct index 306d3a9dc..e1854b1d3 100644 --- a/build/SConstruct +++ b/build/SConstruct @@ -231,6 +231,11 @@ sticky_opts = Options(args=ARGUMENTS) sticky_opts.AddOptions( EnumOption('TARGET_ISA', 'Target ISA', 'alpha', env['ALL_ISA_LIST']), BoolOption('FULL_SYSTEM', 'Full-system support', False), + # There's a bug in scons 0.96.1 that causes ListOptions with list + # values (more than one value) not to be able to be restored from + # a saved option file. If this causes trouble then upgrade to + # scons 0.96.90 or later. + ListOption('CPU_MODELS', 'CPU models', 'all', env['ALL_CPU_LIST']), BoolOption('ALPHA_TLASER', 'Model Alpha TurboLaser platform (vs. Tsunami)', False), BoolOption('NO_FAST_ALLOC', 'Disable fast object allocator', False), @@ -254,12 +259,6 @@ sticky_opts.AddOptions( # Non-sticky options only apply to the current build. nonsticky_opts = Options(args=ARGUMENTS) nonsticky_opts.AddOptions( - # This really should be a sticky option, but there's a bug in - # scons 0.96.1 that causes ListOptions not to be able to be - # restored from a saved option file. It looks like this is fixed - # in 0.96.9, but there's a different bug in that version that means we - # can't just upgrade. - ListOption('CPU_MODELS', 'CPU models', 'all', env['ALL_CPU_LIST']), BoolOption('update_ref', 'Update test reference outputs', False) ) |