diff options
| author | Steven Knight <knight@baldmt.com> | 2004-07-02 19:00:14 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-07-02 19:00:14 (GMT) |
| commit | 8b1b33bcc5a184bb5c70229d9515b9d570eeacd1 (patch) | |
| tree | e462700f31fbbde3002ebf998406c88cdcfb3a19 /src | |
| parent | c2bb425dcb2907f50a485469b69e83884fed6fb4 (diff) | |
| download | SCons-8b1b33bcc5a184bb5c70229d9515b9d570eeacd1.zip SCons-8b1b33bcc5a184bb5c70229d9515b9d570eeacd1.tar.gz SCons-8b1b33bcc5a184bb5c70229d9515b9d570eeacd1.tar.bz2 | |
Delay any creation of DefaultEnvironment() until after the SConscript files are read.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 52a75ce..22d69c0 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -188,10 +188,10 @@ def get_MkdirBuilder(): global MkdirBuilder if MkdirBuilder is None: import SCons.Builder - import SCons.Defaults - env = SCons.Defaults.DefaultEnvironment() + # "env" will get filled in by Executor.get_build_env() + # calling SCons.Defaults.DefaultEnvironment() when necessary. MkdirBuilder = SCons.Builder.Builder(action = Mkdir, - env = env, + env = None, explain = None) return MkdirBuilder @@ -257,18 +257,20 @@ def get_DefaultSCCSBuilder(): global DefaultSCCSBuilder if DefaultSCCSBuilder is None: import SCons.Builder - import SCons.Defaults + # "env" will get filled in by Executor.get_build_env() + # calling SCons.Defaults.DefaultEnvironment() when necessary. DefaultSCCSBuilder = SCons.Builder.Builder(action = '$SCCSCOM', - env = SCons.Defaults.DefaultEnvironment()) + env = None) return DefaultSCCSBuilder def get_DefaultRCSBuilder(): global DefaultRCSBuilder if DefaultRCSBuilder is None: import SCons.Builder - import SCons.Defaults + # "env" will get filled in by Executor.get_build_env() + # calling SCons.Defaults.DefaultEnvironment() when necessary. DefaultRCSBuilder = SCons.Builder.Builder(action = '$RCS_COCOM', - env = SCons.Defaults.DefaultEnvironment()) + env = None) return DefaultRCSBuilder # |