From 1e9b753c95cc78922c45578a4cbfc9c1b6ef416b Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Fri, 30 Nov 2018 23:17:57 +0000 Subject: Report detected compilers in run_project_tests v2: Use compilers.all_languages for the list of known languages --- run_project_tests.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/run_project_tests.py b/run_project_tests.py index fdb5f48..a20f474 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -27,6 +27,7 @@ import tempfile from pathlib import Path, PurePath from mesonbuild import build from mesonbuild import environment +from mesonbuild import compilers from mesonbuild import mesonlib from mesonbuild import mlog from mesonbuild import mtest @@ -768,11 +769,23 @@ def detect_system_compiler(): with AutoDeletedDir(tempfile.mkdtemp(prefix='b ', dir='.')) as build_dir: env = environment.Environment(None, build_dir, get_fake_options('/')) - try: - comp = env.detect_c_compiler(env.is_cross_build()) - except: - raise RuntimeError("Could not find C compiler.") - system_compiler = comp.get_id() + print() + for lang in sorted(compilers.all_languages): + try: + comp = env.compiler_from_language(lang, env.is_cross_build()) + details = '%s %s' % (' '.join(comp.get_exelist()), comp.get_version_string()) + except: + comp = None + details = 'not found' + print('%-7s: %s' % (lang, details)) + + # note C compiler for later use by platform_fix_name() + if lang == 'c': + if comp: + system_compiler = comp.get_id() + else: + raise RuntimeError("Could not find C compiler.") + print() if __name__ == '__main__': parser = argparse.ArgumentParser(description="Run the test suite of Meson.") -- cgit v1.1