diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-06-06 19:19:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 19:19:06 +0300 |
| commit | 09a722c4bd6bf3014190ecc4d91eee1110affd99 (patch) | |
| tree | d90a1df01feb683efa47cb75b87e26ba3eef11c4 /mesonbuild/rewriter.py | |
| parent | 27c5d9f16f535b2aacdf009744d4f99d59b9c81f (diff) | |
| parent | 82e36a6bfe3c765e81438492bdff81e248f11c53 (diff) | |
| download | meson-09a722c4bd6bf3014190ecc4d91eee1110affd99.zip meson-09a722c4bd6bf3014190ecc4d91eee1110affd99.tar.gz meson-09a722c4bd6bf3014190ecc4d91eee1110affd99.tar.bz2 | |
Merge pull request #5263 from Ericson2314/per-machine-cli-args
Per machine 'build_' and '' options
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()): |