aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/ast/introspection.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-06-19 17:01:10 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-08-01 22:00:06 -0700
commit591e6e94b9fccfc49ee7093cb21735a27fd64005 (patch)
tree2a1565a9d32ff9934bc43dfa4ab6c9ba29001f5c /mesonbuild/ast/introspection.py
parent5db3860abf6a27b0dd4653fa8c7143f4a70df7a7 (diff)
downloadmeson-591e6e94b9fccfc49ee7093cb21735a27fd64005.zip
meson-591e6e94b9fccfc49ee7093cb21735a27fd64005.tar.gz
meson-591e6e94b9fccfc49ee7093cb21735a27fd64005.tar.bz2
Put machine file and cmd line parsing in Environment
This creates a full set of option in environment that mirror those in coredata, this mirroring of the coredata structure is convenient because lookups int env (such as when initializing compilers) becomes a straight dict lookup, with no list iteration. It also means that all of the command line and machine files are read and stored in the correct order before they're ever accessed, simplifying the logic of using them.
Diffstat (limited to 'mesonbuild/ast/introspection.py')
-rw-r--r--mesonbuild/ast/introspection.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/ast/introspection.py b/mesonbuild/ast/introspection.py
index 142c219..6e6927f 100644
--- a/mesonbuild/ast/introspection.py
+++ b/mesonbuild/ast/introspection.py
@@ -120,7 +120,7 @@ class IntrospectionInterpreter(AstInterpreter):
self.do_subproject(i)
self.coredata.init_backend_options(self.backend)
- options = {k: v for k, v in self.environment.cmd_line_options.items() if k.startswith('backend_')}
+ options = {k: v for k, v in self.environment.meson_options.host[''].items() if k.startswith('backend_')}
self.coredata.set_options(options)
self.func_add_languages(None, proj_langs, None)