diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-01-04 23:42:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-04 23:42:50 +0000 |
| commit | d47a5c81a9af992eca42d857477f2bb5821712b6 (patch) | |
| tree | 9c9ff772c696661a1582dc81c86273e8d975a13f /mesonbuild/rewriter.py | |
| parent | 6b515c432109cf7ab488da37cddeb1752e91fa5c (diff) | |
| parent | f14bf8b2ed052f68857ed3eaec08a326d335a3a4 (diff) | |
| download | meson-d47a5c81a9af992eca42d857477f2bb5821712b6.zip meson-d47a5c81a9af992eca42d857477f2bb5821712b6.tar.gz meson-d47a5c81a9af992eca42d857477f2bb5821712b6.tar.bz2 | |
Merge pull request #8080 from dcbaker/submit/option-key-type
Use an object for option keys
Diffstat (limited to 'mesonbuild/rewriter.py')
| -rw-r--r-- | mesonbuild/rewriter.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py index 857ba0e..6b7a987 100644 --- a/mesonbuild/rewriter.py +++ b/mesonbuild/rewriter.py @@ -464,14 +464,11 @@ 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()}, - **cdata.backend_options, - **cdata.base_options, - **(dict(cdata.flatten_lang_iterator(cdata.compiler_options.host.items()))), - **{'build.' + k: o for k, o in cdata.flatten_lang_iterator(cdata.compiler_options.build.items())}, - **cdata.user_options, + **{str(k): v for k, v in cdata.options.items()}, + **{str(k): v for k, v in cdata.options.items()}, + **{str(k): v for k, v in cdata.options.items()}, + **{str(k): v for k, v in cdata.options.items()}, + **{str(k): v for k, v in cdata.options.items()}, } for key, val in sorted(cmd['options'].items()): |