From 71db6b04a31707674ad776be1cf22f667056d56b Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 4 Dec 2020 16:09:10 -0800 Subject: use OptionKey for builtin and base options I would have prefered to do these seperatately, but they are combined in some cases, so it was much easier to convert them together. this eliminates the builtins_per_machine dict, as it's duplicated with the OptionKey's machine parameter. --- mesonbuild/msetup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/msetup.py') diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index d336a13..55c9e09 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -177,7 +177,7 @@ class MesonApp: mlog.initialize(env.get_log_dir(), self.options.fatal_warnings) if self.options.profile: mlog.set_timestamp_start(time.monotonic()) - if env.coredata.builtins['backend'].value == 'xcode': + if env.coredata.builtins[mesonlib.OptionKey('backend')].value == 'xcode': mlog.warning('xcode backend is currently unmaintained, patches welcome') with mesonlib.BuildDirLock(self.build_dir): self._generate(env) -- cgit v1.1