On 25/01/2021 17.58, Philippe Mathieu-Daudé wrote:
It is pointless to build the s390-ccw BIOS when only user-mode
emulation is built. Only build it when s390 system mode emulation
is selected.
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
---
v3: Restrict to s390x host (thuth)
v2: Restrict to s390x-softmmu target (thuth)
---
configure | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index dcc5ea7d630..4751d3e352d 100755
--- a/configure
+++ b/configure
@@ -5372,8 +5372,14 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; }
&& \
done
fi
+s390_ccw_bios=no
+# Only build s390-ccw bios if we're targetting s390x system emulation
+case $target_list in
+ *"s390x-softmmu"*) s390_ccw_bios=yes
+ ;;
+esac
# Only build s390-ccw bios if we're on s390x and the compiler has -march=z900
-if test "$cpu" = "s390x" ; then
+if test "$cpu" = "s390x" && test "$s390_ccw_bios" = yes; then
Looks good to me now ... but maybe it could even be done simpler (without
the case statement) by simply doing:
if test "$cpu" = "s390x" && echo "$target_list" | grep -q s390x-softmmu ; then
...
?
Thomas
