Merge zizzer:/bk/newmem

into  zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem

--HG--
extra : convert_revision : 0a146eed200abd2c18f135b112987c5cf91a649b

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