aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-07-17 19:57:23 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2019-08-06 21:34:15 +0300
commit8a4aceef43a3c9c167b375cf9b701ea888bdff14 (patch)
treee07c9cb91e85ef0319cfd4b378fccff52aacea18
parentb739652bc41561ee9e755d9d2aaa4a917abeb556 (diff)
downloadmeson-8a4aceef43a3c9c167b375cf9b701ea888bdff14.zip
meson-8a4aceef43a3c9c167b375cf9b701ea888bdff14.tar.gz
meson-8a4aceef43a3c9c167b375cf9b701ea888bdff14.tar.bz2
Do not print build and host settings when compiling natively.
-rw-r--r--mesonbuild/mconf.py22
1 files changed, 14 insertions, 8 deletions
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py
index 84c41d0..cac9d61 100644
--- a/mesonbuild/mconf.py
+++ b/mesonbuild/mconf.py
@@ -181,16 +181,22 @@ 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()})
+ 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)