diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-09-13 12:23:06 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-09-13 15:44:02 +0300 |
| commit | 47bdea504067d00e9bed522e9575bd2416bfe4ee (patch) | |
| tree | f970d1798727c88c8b945b20f4296dbccc5144b2 /mesonbuild/mconf.py | |
| parent | ad368cfc07b1bac1aa00e51038e749040cc2dea0 (diff) | |
| download | meson-47bdea504067d00e9bed522e9575bd2416bfe4ee.zip meson-47bdea504067d00e9bed522e9575bd2416bfe4ee.tar.gz meson-47bdea504067d00e9bed522e9575bd2416bfe4ee.tar.bz2 | |
mconf: Fix meson configure crash (fixes #5909)
Diffstat (limited to 'mesonbuild/mconf.py')
| -rw-r--r-- | mesonbuild/mconf.py | 4 |
1 files changed, 2 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)', |