summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Script
diff options
context:
space:
mode:
authoranatoly techtonik <techtonik@gmail.com>2014-06-01 10:29:01 (GMT)
committeranatoly techtonik <techtonik@gmail.com>2014-06-01 10:29:01 (GMT)
commit1c43f7f384bf30f6cce14dc9d3d1e485891c7ddd (patch)
tree326fbd5c51ddb26d98d799e6b972a21d5a72d2c5 /src/engine/SCons/Script
parent2df3e0774d35b0685523dbbe89549d22d59cdde7 (diff)
downloadSCons-1c43f7f384bf30f6cce14dc9d3d1e485891c7ddd.zip
SCons-1c43f7f384bf30f6cce14dc9d3d1e485891c7ddd.tar.gz
SCons-1c43f7f384bf30f6cce14dc9d3d1e485891c7ddd.tar.bz2
Speed up SCons execution by creating DefaultEnvironment for
SCons.SConf.CreateConfigHBuilder only if necessary.
Diffstat (limited to 'src/engine/SCons/Script')
-rw-r--r--src/engine/SCons/Script/Main.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index d4dd229..439b869 100644
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -1031,7 +1031,11 @@ def _main(parser):
msg % (deprecated_version_string, python_version_string()))
if not options.help:
- SCons.SConf.CreateConfigHBuilder(SCons.Defaults.DefaultEnvironment())
+ # [ ] Clarify why we need to create Builder here at all, and
+ # why it is created in DefaultEnvironment
+ # https://bitbucket.org/scons/scons/commits/d27a548aeee8ad5e67ea75c2d19a7d305f784e30
+ if SCons.SConf.NeedConfigHBuilder():
+ SCons.SConf.CreateConfigHBuilder(SCons.Defaults.DefaultEnvironment())
# Now re-parse the command-line options (any to the left of a '--'
# argument, that is) with any user-defined command-line options that