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/mintro.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/mintro.py')
| -rw-r--r-- | mesonbuild/mintro.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 7975684..b700b00 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -227,10 +227,20 @@ def list_buildoptions(coredata: cdata.CoreData) -> List[dict]: core_options = {k: o for k, o in coredata.builtins.items() if k in core_option_names} add_keys(optlist, core_options, 'core') + add_keys(optlist, coredata.builtins_per_machine.host, 'core (for host machine)') + add_keys( + optlist, + {'build.' + k: o for k, o in coredata.builtins_per_machine.build.items()}, + 'core (for build machine)', + ) add_keys(optlist, coredata.backend_options, 'backend') add_keys(optlist, coredata.base_options, 'base') - # TODO others - add_keys(optlist, coredata.compiler_options.build, 'compiler') + add_keys(optlist, coredata.compiler_options.host, 'compiler (for host machine)') + add_keys( + optlist, + {'build.' + k: o for k, o in coredata.compiler_options.build.items()}, + 'compiler (for build machine)', + ) add_keys(optlist, dir_options, 'directory') add_keys(optlist, coredata.user_options, 'user') add_keys(optlist, test_options, 'test') |