diff options
| author | Alex Bennée | 2021-02-22 11:14:50 +0100 |
|---|---|---|
| committer | Alex Bennée | 2021-02-24 12:05:05 +0100 |
| commit | 49e8565b3df3f43aae57a3850e1b4cd176ef6582 (patch) | |
| tree | 6b861189a26523f8d9da8c2a2541fef0a56091b9 | |
| parent | Merge remote-tracking branch 'remotes/edgar/tags/edgar/cris-next-2021-02-22.f... (diff) | |
| download | qemu-49e8565b3df3f43aae57a3850e1b4cd176ef6582.tar.gz qemu-49e8565b3df3f43aae57a3850e1b4cd176ef6582.tar.xz qemu-49e8565b3df3f43aae57a3850e1b4cd176ef6582.zip | |
meson.build: expose TCG cross compiler information in summary
Blink and you miss the cross TCG compiler stuff so lets display it
with the rest of the compiler information.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210222101455.12640-2-alex.bennee@linaro.org>
| -rw-r--r-- | meson.build | 18 | ||||
| -rwxr-xr-x | tests/tcg/configure.sh | 8 |
2 files changed, 18 insertions, 8 deletions
diff --git a/meson.build b/meson.build index 05a67c20d9..f3db83e974 100644 --- a/meson.build +++ b/meson.build @@ -2509,6 +2509,24 @@ endif summary_info += {'strip binaries': get_option('strip')} summary_info += {'sparse': sparse.found() ? sparse.full_path() : false} summary_info += {'mingw32 support': targetos == 'windows'} + +# snarf the cross-compilation information for tests +foreach target: target_dirs + tcg_mak = meson.current_build_dir() / 'tests/tcg' / 'config-' + target + '.mak' + if fs.exists(tcg_mak) + config_cross_tcg = keyval.load(tcg_mak) + target = config_cross_tcg['TARGET_NAME'] + compiler = '' + if 'DOCKER_CROSS_CC_GUEST' in config_cross_tcg + summary_info += {target + ' tests': config_cross_tcg['DOCKER_CROSS_CC_GUEST'] + + ' via ' + config_cross_tcg['DOCKER_IMAGE']} + elif 'CROSS_CC_GUEST' in config_cross_tcg + summary_info += {target + ' tests' + : config_cross_tcg['CROSS_CC_GUEST'] } + endif + endif +endforeach + summary(summary_info, bool_yn: true, section: 'Compilation') # Targets and accelerators diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 551c02f469..36b8a73a54 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -263,11 +263,3 @@ for target in $target_list; do echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> $config_target_mak fi done - -# report container support state -echo "cross containers $container" - -if test -n "$enabled_cross_compilers"; then - echo - echo "NOTE: guest cross-compilers enabled:$enabled_cross_compilers" -fi |