summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-05-10 18:34:26 -0400
committerKorey Sewell <ksewell@umich.edu>2006-05-10 18:34:26 -0400
commit45524e8f2d7b5ee0afa3b6bfc852ec2344673e06 (patch)
treef6792ff4d21beb177c2f2d0f2df18210da6b70af
parent6375b7aca9020147a77d69d1dc2ad45d2817cfd9 (diff)
parent4758eb151f79233b60147914e6474c78522447f7 (diff)
downloadgem5-45524e8f2d7b5ee0afa3b6bfc852ec2344673e06.tar.xz
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem --HG-- extra : convert_revision : 0a146eed200abd2c18f135b112987c5cf91a649b
-rw-r--r--build/SConstruct12
1 files changed, 12 insertions, 0 deletions
diff --git a/build/SConstruct b/build/SConstruct
index e1854b1d3..28940fc5a 100644
--- a/build/SConstruct
+++ b/build/SConstruct
@@ -328,6 +328,11 @@ env.Append(BUILDERS = { 'ConfigFile' : config_builder })
# rename base env
base_env = env
+help_text = '''
+Usage: scons [scons options] [build options] [target(s)]
+
+'''
+
for build_dir in build_dirs:
# Make a copy of the default environment to use for this config.
env = base_env.Copy()
@@ -361,6 +366,11 @@ for build_dir in build_dirs:
sticky_opts.Update(env)
nonsticky_opts.Update(env)
+ help_text += "Sticky options for %s:\n" % build_dir \
+ + sticky_opts.GenerateHelpText(env) \
+ + "\nNon-sticky options for %s:\n" % build_dir \
+ + nonsticky_opts.GenerateHelpText(env)
+
# Process option settings.
if not have_fenv and env['USE_FENV']:
@@ -409,6 +419,8 @@ for build_dir in build_dirs:
build_dir = os.path.join(build_dir, 'test', e.Label),
exports = { 'env' : e }, duplicate = False)
+Help(help_text)
+
###################################################
#
# Let SCons do its thing. At this point SCons will use the defined