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/mconf.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/mconf.py')
| -rw-r--r-- | mesonbuild/mconf.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index 6e0d2d0..84c41d0 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -181,10 +181,16 @@ class Conf: core_options = {k: o for k, o in self.coredata.builtins.items() if k in core_option_names} self.print_options('Core options', core_options) + self.print_options('Core options (for host machine)', self.coredata.builtins_per_machine.host) + self.print_options( + 'Core options (for build machine)', + {'build.' + k: o for k, o in self.coredata.builtins_per_machine.build.items()}) self.print_options('Backend options', self.coredata.backend_options) self.print_options('Base options', self.coredata.base_options) - # TODO others - self.print_options('Compiler options', self.coredata.compiler_options.build) + self.print_options('Compiler options (for host machine)', self.coredata.compiler_options.host) + self.print_options( + 'Compiler options (for build machine)', + {'build.' + k: o for k, o in self.coredata.compiler_options.build.items()}) self.print_options('Directories', dir_options) self.print_options('Project options', self.coredata.user_options) self.print_options('Testing options', test_options) @@ -207,9 +213,6 @@ def run(options): save = False if len(options.cmd_line_options) > 0: c.set_options(options.cmd_line_options) - if not c.build.environment.is_cross_build(): - # TODO think about cross and command-line interface. - c.coredata.compiler_options.host = c.coredata.compiler_options.build coredata.update_cmd_line_file(builddir, options) save = True elif options.clearcache: |