From 85b141ea6ae448b718d438d9cf0009d73116f8d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>
Date: Fri, 27 May 2022 16:35:34 +0100
Subject: [PATCH] meson.build: fix summary display of test compilers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The recent refactoring of configure.sh dropped a number of variables
we relied on for printing out information. Make it simpler.
Fixes: eebf199c09 (tests/tcg: invoke Makefile.target directly from QEMU's makefile)
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220527153603.887929-5-alex.bennee@linaro.org>
---
meson.build | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index bf318d9cbb4..bc6234c85e2 100644
--- a/meson.build
+++ b/meson.build
@@ -3735,12 +3735,8 @@ foreach target: target_dirs
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'] }
+ if 'CC' in config_cross_tcg
+ summary_info += {target + ' tests': config_cross_tcg['CC']}
endif
endif
endforeach
--
GitLab