From d941ca1b19e7016251966d676b33611f56dc56c1 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 16 May 2019 11:12:17 -0700 Subject: mconf: Don't change the type of coredata.deps Which is an OrderedDict, but mconf changes to a plain dict. This will work fine with Python 3.7+, but not with 3.5 and 3.6 --- mesonbuild/mconf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/mconf.py') diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index 3b50d55..b62c8b3 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -63,7 +63,7 @@ class Conf: raise ConfException('Directory {} is neither a Meson build directory nor a project source directory.'.format(build_dir)) def clear_cache(self): - self.coredata.deps = {} + self.coredata.deps.clear() def set_options(self, options): self.coredata.set_options(options) -- cgit v1.1 From 146e97e974fe02f93e3fb20d2a1cb850255f69fc Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 15 May 2019 14:02:14 -0700 Subject: Use dependency cache --- mesonbuild/mconf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesonbuild/mconf.py') diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index b62c8b3..6e0d2d0 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -63,7 +63,8 @@ class Conf: raise ConfException('Directory {} is neither a Meson build directory nor a project source directory.'.format(build_dir)) def clear_cache(self): - self.coredata.deps.clear() + self.coredata.deps.host.clear() + self.coredata.deps.build.clear() def set_options(self, options): self.coredata.set_options(options) -- cgit v1.1