diff options
| author | Steven Knight <knight@baldmt.com> | 2003-07-22 11:38:20 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-07-22 11:38:20 (GMT) |
| commit | 17f8210401fbaf283fba34e5d87700e4e7431470 (patch) | |
| tree | 85869e6a0a2ff03ee52b9d34052225d9cc580106 /src/engine/SCons/Script | |
| parent | 1737bf0b826d00d06a62f623e61404795cc65b49 (diff) | |
| download | SCons-17f8210401fbaf283fba34e5d87700e4e7431470.zip SCons-17f8210401fbaf283fba34e5d87700e4e7431470.tar.gz SCons-17f8210401fbaf283fba34e5d87700e4e7431470.tar.bz2 | |
Only create a default Environment when asked to. (Chad Austin)
Diffstat (limited to 'src/engine/SCons/Script')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 5f7f4b5..313a3f2 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -513,7 +513,6 @@ def BuildDefaultGlobals(): """ globals = {} - globals['_default_env'] = SCons.Defaults._default_env globals['Action'] = SCons.Action.Action globals['AddPostAction'] = AddPostAction globals['AddPreAction'] = AddPreAction @@ -526,6 +525,7 @@ def BuildDefaultGlobals(): globals['Configure'] = SCons.SConf.SConf globals['CScan'] = SCons.Defaults.CScan globals['Default'] = Default + globals['DefaultEnvironment'] = SCons.Defaults.DefaultEnvironment globals['Dir'] = SCons.Node.FS.default_fs.Dir globals['EnsurePythonVersion'] = EnsurePythonVersion globals['EnsureSConsVersion'] = EnsureSConsVersion diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index fe56568..c171a91 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -750,10 +750,6 @@ def _main(args, parser): SCons.Node.FS.default_fs.set_toplevel_dir(os.getcwd()) - # Now that the top-level directory has been set, - # we can initialize the default Environment. - SCons.Defaults._default_env = SCons.Environment.Environment() - scripts = [] if options.file: scripts.extend(options.file) |