From de904a6d396f01a42da5399b2798568c61abeeea Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 17 Jan 2010 02:22:30 -0800 Subject: [PATCH] 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. --- SConstruct | 4 ++-- 1 file 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)