diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/coredata.py | 6 | ||||
| -rw-r--r-- | mesonbuild/interpreter/dependencyfallbacks.py | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index f1cf0e0..e1fa047 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -704,12 +704,6 @@ class CoreData: if key.name == 'buildtype': dirty |= self._set_others_from_buildtype(value) - elif key.name in {'wrap_mode', 'force_fallback_for'}: - # We could have the system dependency cached for a dependency that - # is now forced to use subproject fallback. We probably could have - # more fine-grained cache invalidation, but better be safe. - self.clear_deps_cache() - dirty = True return dirty diff --git a/mesonbuild/interpreter/dependencyfallbacks.py b/mesonbuild/interpreter/dependencyfallbacks.py index 54be990..79ca884 100644 --- a/mesonbuild/interpreter/dependencyfallbacks.py +++ b/mesonbuild/interpreter/dependencyfallbacks.py @@ -220,6 +220,8 @@ class DependencyFallbacksHolder(MesonInterpreterObject): mlog.log('Dependency', mlog.bold(self._display_name), 'found:', mlog.red('NO'), *info) return cached_dep + elif self.forcefallback and self.subproject_name: + cached_dep = None else: info = [mlog.blue('(cached)')] cached_dep = self.coredata.deps[for_machine].get(identifier) |