Initial try of consolidating configuration files so they can be shared more easily...

[gem5.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 6f20d97563526df667f83b2001a9d82209f97046..b18fe66d346609a46d1083d9aa3a63e6d5e9a980 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -159,7 +159,7 @@ env = Environment(ENV = os.environ,  # inherit user's environment vars
                   ROOT = ROOT,
                   SRCDIR = SRCDIR)
 
-env.SConsignFile("sconsign")
+env.SConsignFile(os.path.join(build_root,"sconsign"))
 
 # Default duplicate option is to use hard links, but this messes up
 # when you use emacs to edit a file in the target dir, as emacs moves
@@ -263,8 +263,8 @@ env['ALL_ISA_LIST'] = ['alpha', 'sparc', 'mips']
 
 # Define the universe of supported CPU models
 env['ALL_CPU_LIST'] = ['AtomicSimpleCPU', 'TimingSimpleCPU',
-                       'FullCPU', 'AlphaO3CPU',
-                       'OzoneSimpleCPU', 'OzoneCPU']
+                       'FullCPU', 'O3CPU',
+                       'OzoneCPU']
 
 # Sticky options get saved in the options file so they persist from
 # one invocation to the next (unless overridden, in which case the new