diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2021-03-01 18:50:25 (GMT) |
|---|---|---|
| committer | Daniel Moody <daniel.moody@mongodb.com> | 2021-04-01 16:50:41 (GMT) |
| commit | d6efcab9e4669b8818e6db3f17b76515fc7bf171 (patch) | |
| tree | 70a8ba78a365e5cd51ddae02daf99823ee720b62 /SCons/Environment.py | |
| parent | 1fc91c5e7531daf60a93359f1d6d09b33a3d6c32 (diff) | |
| download | SCons-d6efcab9e4669b8818e6db3f17b76515fc7bf171.zip SCons-d6efcab9e4669b8818e6db3f17b76515fc7bf171.tar.gz SCons-d6efcab9e4669b8818e6db3f17b76515fc7bf171.tar.bz2 | |
Added reinstantiatng custom cachedir
Diffstat (limited to 'SCons/Environment.py')
| -rw-r--r-- | SCons/Environment.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/SCons/Environment.py b/SCons/Environment.py index c27f94e..1227f37 100644 --- a/SCons/Environment.py +++ b/SCons/Environment.py @@ -956,8 +956,6 @@ class Base(SubstitutionEnvironment): self.decide_target = default_decide_target self.decide_source = default_decide_source - self.copy_from_cache = default_copy_from_cache - self.copy_to_cache = default_copy_to_cache self.cache_timestamp_newer = False self._dict['BUILDERS'] = BuilderDict(self._dict['BUILDERS'], self) @@ -1039,7 +1037,8 @@ class Base(SubstitutionEnvironment): except AttributeError: path = SCons.Defaults.DefaultEnvironment()._CacheDir_path try: - if path == self._last_CacheDir_path: + if (path == self._last_CacheDir_path + and self.get("CACHEDIR_CLASS", SCons.CacheDir.CacheDir) == type(self._last_CacheDir)): return self._last_CacheDir except AttributeError: pass |