diff options
| -rw-r--r-- | mesonbuild/mconf.py | 4 | ||||
| -rwxr-xr-x | run_unittests.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index cac9d61..4f80140 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -181,7 +181,7 @@ 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) - if self.build.environment.is_cross_build(): + if self.default_values_only or self.build.environment.is_cross_build(): self.print_options('Core options (for host machine)', self.coredata.builtins_per_machine.host) self.print_options( 'Core options (for build machine)', @@ -190,7 +190,7 @@ class Conf: self.print_options('Core options', self.coredata.builtins_per_machine.host) self.print_options('Backend options', self.coredata.backend_options) self.print_options('Base options', self.coredata.base_options) - if self.build.environment.is_cross_build(): + if self.default_values_only or self.build.environment.is_cross_build(): self.print_options('Compiler options (for host machine)', self.coredata.compiler_options.host) self.print_options( 'Compiler options (for build machine)', diff --git a/run_unittests.py b/run_unittests.py index f06be23..8cc9811 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -3624,6 +3624,10 @@ recommended as it is not supported on some platforms''') self.maxDiff = None self.assertListEqual(res_nb, res_wb) + def test_meson_configure_from_source_does_not_crash(self): + testdir = os.path.join(self.unit_test_dir, '59 introspect buildoptions') + self._run(self.mconf_command + [testdir]) + def test_introspect_json_dump(self): testdir = os.path.join(self.unit_test_dir, '57 introspection') self.init(testdir) |