diff options
author | Mathias Stearn <mathias@10gen.com> | 2016-05-25 12:36:57 -0400 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2016-06-09 13:00:49 -0400 |
commit | 6335744b8af97e4f5b3fb15118f24833df6e7047 (patch) | |
tree | c878b015ccce5ae43ad4ca0bc1b9c98257b0f59a /SConstruct | |
parent | b62aeb6ead2108b674728984e8b9f94208969d10 (diff) | |
download | mongo-6335744b8af97e4f5b3fb15118f24833df6e7047.tar.gz |
SERVER-24290 include variables in scons --help
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index ad19c16677f..b87c251f231 100644 --- a/SConstruct +++ b/SConstruct @@ -721,10 +721,6 @@ env_vars.Add('VERBOSE', default='auto', ) -# don't run configure if user calls --help -if GetOption('help'): - Return() - # -- Validate user provided options -- # A dummy environment that should *only* have the variables we have set. In practice it has @@ -741,6 +737,12 @@ variables_only_env = Environment( variables=env_vars, ) +# don't run configure if user calls --help +if GetOption('help'): + Help('\nThe following variables may also be set like scons VARIABLE=value\n', append=True); + Help(env_vars.GenerateHelpText(variables_only_env), append=True); + Return() + if ('CC' in variables_only_env) != ('CXX' in variables_only_env): print('Cannot customize C compiler without customizing C++ compiler, and vice versa') Exit(1) |