From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Wed, 29 Mar 2006 03:55:08 +0000 (-0500)
Subject: Make CPU_MODELS a sticky build option.
X-Git-Tag: m5_2.0_beta1~137^2~10
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c5c76cea9871796820f1597f286dcfc21c85a180;p=gem5.git

Make CPU_MODELS a sticky build option.
This causes a crash if you're using scons 0.96.1 *and* you specify
more than one CPU model.  Since the .isa scanner now works with 0.96.91
then upgrading should not be an issue.  For now we're only using one CPU
model (SimpleCPU) so there isn't even a pressing need to upgrade yet.

build/SConstruct:
    Make CPU_MODELS a sticky option.
    This causes a crash if you're using scons 0.96.1 *and* you specify
    more than one CPU model.  Since the .isa scanner now works with 0.96.91
    then upgrading should not be an issue.  For now we're only using one CPU
    model (SimpleCPU) so there isn't even a pressing need to upgrade yet.

--HG--
extra : convert_revision : d8319c4cd5c937c2c033270cef850d19b805d256
---

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)
     )