60f0b7a167
Fix some gcc9 compatibility issues. OBS-URL: https://build.opensuse.org/request/show/706380 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=474
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Tue, 28 May 2019 14:23:37 -0600
|
|
Subject: configure: only populate roms if softmmu
|
|
|
|
Currently roms are mistakenly getting built in a linux-user only
|
|
configuration. Add check for softmmu in all places where our list of
|
|
roms is being added to.
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
configure | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 5df1b9a285..cf261e9cc5 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6166,12 +6166,13 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
|
|
fi
|
|
done
|
|
fi
|
|
-if test "$cpu" = "ppc64" && test "$targetos" != "Darwin" ; then
|
|
+if test "$cpu" = "ppc64" && test "$targetos" != "Darwin" && \
|
|
+ test "$softmmu" = yes ; then
|
|
roms="$roms spapr-rtas"
|
|
fi
|
|
|
|
# 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 "$softmmu" = yes ; then
|
|
write_c_skeleton
|
|
if compile_prog "-march=z900" ""; then
|
|
roms="$roms s390-ccw"
|