summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-01-17 02:22:30 -0800
committerGabe Black <gblack@eecs.umich.edu>2010-01-17 02:22:30 -0800
commitde904a6d396f01a42da5399b2798568c61abeeea (patch)
tree7262877585c3aecb7e9a82fea45b28dcc3e12c7b /SConstruct
parent4f4e6fc099349cf34e9ac4cfae4211379a4a030f (diff)
downloadgem5-de904a6d396f01a42da5399b2798568c61abeeea.tar.xz
SCons: Make --help reflect the arguments to scons.
The arguments were added to the global_sticky_vars Variables object after the basic help text was generated. As a result, the "actual:" value wouldn't reflect the arguments to scons and wouldn't really be the "actual" value used by the build. This change fixes that by updating global_sticky_vars slightly earlier.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct4
1 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index dac317fe8..6ca3d6a14 100644
--- a/SConstruct
+++ b/SConstruct
@@ -324,11 +324,11 @@ Usage: scons [scons options] [build options] [target(s)]
Global sticky options:
'''
-help_text += global_sticky_vars.GenerateHelpText(main)
-
# Update main environment with values from ARGUMENTS & global_sticky_vars_file
global_sticky_vars.Update(main)
+help_text += global_sticky_vars.GenerateHelpText(main)
+
# Save sticky variable settings back to current variables file
global_sticky_vars.Save(global_sticky_vars_file, main)