Merged revisions 2136-2200,2202-2290,2292-2301 via svnmerge from

[scons.git] / src / engine / SCons / Defaults.py

diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index 9d0ad8259bc4022eca6ff6d33bf9b621f95e3d0f..29868ecc1587cd8b8e0b60907bc0c4ebf8e23bec 100644 (file)
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -46,6 +46,7 @@ import sys
 
 import SCons.Action
 import SCons.Builder
+import SCons.CacheDir
 import SCons.Environment
 import SCons.PathList
 import SCons.Sig
@@ -66,6 +67,7 @@ def DefaultEnvironment(*args, **kw):
         _default_env = apply(SCons.Environment.Environment, args, kw)
         _default_env._build_signature = 1
         _default_env._calc_module = SCons.Sig.default_module
+        _default_env._CacheDir = SCons.CacheDir.Null()
     return _default_env
 
 # Emitters for setting the shared attribute on object files,