diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-12-04 16:09:10 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-01-04 12:20:40 -0800 |
| commit | 71db6b04a31707674ad776be1cf22f667056d56b (patch) | |
| tree | b62c0721557766ddc2034e740960d00a37cd9991 /mesonbuild/rewriter.py | |
| parent | f9b19e73a5b87a2f3c8506cf19cfd5bbc468e938 (diff) | |
| download | meson-71db6b04a31707674ad776be1cf22f667056d56b.zip meson-71db6b04a31707674ad776be1cf22f667056d56b.tar.gz meson-71db6b04a31707674ad776be1cf22f667056d56b.tar.bz2 | |
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.
Diffstat (limited to 'mesonbuild/rewriter.py')
| -rw-r--r-- | mesonbuild/rewriter.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py index 776a39a..fbbdcc1 100644 --- a/mesonbuild/rewriter.py +++ b/mesonbuild/rewriter.py @@ -464,11 +464,9 @@ class Rewriter: cdata = self.interpreter.coredata options = { - **cdata.builtins, - **cdata.builtins_per_machine.host, - **{'build.' + k: o for k, o in cdata.builtins_per_machine.build.items()}, + **{str(k): v for k, v in cdata.builtins.items()}, **{str(k): v for k, v in cdata.backend_options.items()}, - **cdata.base_options, + **{str(k): v for k, v in cdata.base_options.items()}, **{str(k): v for k, v in cdata.compiler_options.items()}, **{str(k): v for k, v in cdata.user_options.items()}, } |