From 8764e4f579287d2bc15d5ea8b0a5382c90712ec0 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Wed, 17 Jul 2019 19:35:46 +0300 Subject: [PATCH] Print only host platform info in some cases during native builds Build and target info is confusing in that case. However still log that information, as it is useful in case something slips out of sync and needs to be debugged. --- mesonbuild/interpreter.py | 9 ++++++--- mesonbuild/msetup.py | 15 +++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index c6ad8157d..d45b313c1 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2822,9 +2822,12 @@ external dependencies (including libraries) must go to "dependencies".''') continue else: raise - if machine_name != 'build' or self.environment.is_cross_build(): - mlog.log(comp.get_display_language(), 'compiler for the', machine_name, 'machine:', - mlog.bold(' '.join(comp.get_exelist())), comp.get_version_string()) + if for_machine == MachineChoice.HOST or self.environment.is_cross_build(): + logger_fun = mlog.log + else: + logger_fun = mlog.debug + logger_fun(comp.get_display_language(), 'compiler for the', machine_name, 'machine:', + mlog.bold(' '.join(comp.get_exelist())), comp.get_version_string()) self.build.ensure_static_linker(comp) langs = self.coredata.compilers[for_machine].keys() diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index 5670b2534..4e6f40154 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -174,12 +174,15 @@ class MesonApp: intr = interpreter.Interpreter(b) if env.is_cross_build(): - mlog.log('Host machine cpu family:', mlog.bold(intr.builtin['host_machine'].cpu_family_method([], {}))) - mlog.log('Host machine cpu:', mlog.bold(intr.builtin['host_machine'].cpu_method([], {}))) - mlog.log('Target machine cpu family:', mlog.bold(intr.builtin['target_machine'].cpu_family_method([], {}))) - mlog.log('Target machine cpu:', mlog.bold(intr.builtin['target_machine'].cpu_method([], {}))) - mlog.log('Build machine cpu family:', mlog.bold(intr.builtin['build_machine'].cpu_family_method([], {}))) - mlog.log('Build machine cpu:', mlog.bold(intr.builtin['build_machine'].cpu_method([], {}))) + logger_fun = mlog.log + else: + logger_fun = mlog.debug + logger_fun('Build machine cpu family:', mlog.bold(intr.builtin['build_machine'].cpu_family_method([], {}))) + logger_fun('Build machine cpu:', mlog.bold(intr.builtin['build_machine'].cpu_method([], {}))) + mlog.log('Host machine cpu family:', mlog.bold(intr.builtin['host_machine'].cpu_family_method([], {}))) + mlog.log('Host machine cpu:', mlog.bold(intr.builtin['host_machine'].cpu_method([], {}))) + logger_fun('Target machine cpu family:', mlog.bold(intr.builtin['target_machine'].cpu_family_method([], {}))) + logger_fun('Target machine cpu:', mlog.bold(intr.builtin['target_machine'].cpu_method([], {}))) try: if self.options.profile: fname = os.path.join(self.build_dir, 'meson-private', 'profile-interpreter.log')