Skip to content

Commit

Permalink
Do not print build and host settings when compiling natively.
Browse files Browse the repository at this point in the history
  • Loading branch information
jpakkane committed Aug 6, 2019
1 parent b739652 commit 8a4acee
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions mesonbuild/mconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,22 @@ def print_default_values_warning():
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()})
if 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)',
{'build.' + k: o for k, o in self.coredata.builtins_per_machine.build.items()})
else:
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)
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()})
if 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)',
{'build.' + k: o for k, o in self.coredata.compiler_options.build.items()})
else:
self.print_options('Compiler options', self.coredata.compiler_options.host)
self.print_options('Directories', dir_options)
self.print_options('Project options', self.coredata.user_options)
self.print_options('Testing options', test_options)
Expand Down

0 comments on commit 8a4acee

Please sign in to comment.