diff options
| author | John Ericson <git@JohnEricson.me> | 2019-04-15 01:23:10 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-06-05 23:05:34 -0400 |
| commit | af2d7af9983a04fa2dd6c073bdc41847a23012c8 (patch) | |
| tree | aa84b24acb247df40bc924557f92934e3e3776f3 /mesonbuild/rewriter.py | |
| parent | 126100b1666bfd75db37a0a9aaeee5dbfd11e53a (diff) | |
| download | meson-af2d7af9983a04fa2dd6c073bdc41847a23012c8.zip meson-af2d7af9983a04fa2dd6c073bdc41847a23012c8.tar.gz meson-af2d7af9983a04fa2dd6c073bdc41847a23012c8.tar.bz2 | |
Per machine do 'build.' and '' option prefixes
See the docs/ changes for details.
Diffstat (limited to 'mesonbuild/rewriter.py')
| -rw-r--r-- | mesonbuild/rewriter.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py index a6860d5..e700718 100644 --- a/mesonbuild/rewriter.py +++ b/mesonbuild/rewriter.py @@ -465,10 +465,13 @@ 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, - **cdata.compiler_options.build, - **cdata.user_options + **cdata.compiler_options.host, + **{'build.' + k: o for k, o in cdata.compiler_options.build.items()}, + **cdata.user_options, } for key, val in sorted(cmd['options'].items()): |