aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2022-09-29 12:41:57 +0100
committerAlex Bennée <alex.bennee@linaro.org>2022-10-06 11:53:40 +0100
commit61cbb35677896ef2de8aa907e91024a9e69edde8 (patch)
tree03c9dc79aca36670d6f7defc3b6bb6244341f017 /configure
parent4a3447e5b393d11e3b7aaf50602cbc28a7deeb88 (diff)
downloadqemu-61cbb35677896ef2de8aa907e91024a9e69edde8.zip
qemu-61cbb35677896ef2de8aa907e91024a9e69edde8.tar.gz
qemu-61cbb35677896ef2de8aa907e91024a9e69edde8.tar.bz2
configure: return status code from probe_target_compiler
For now, return 1 for container-based compilers. This will change as soon as ROMs will be buildable with them. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20220929114231.583801-18-alex.bennee@linaro.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure14
1 files changed, 6 insertions, 8 deletions
diff --git a/configure b/configure
index 7ae448d..a62a833 100755
--- a/configure
+++ b/configure
@@ -2116,6 +2116,7 @@ probe_target_compiler() {
target_ranlib=
target_strip=
fi
+ test -n "$target_cc"
}
write_target_makefile() {
@@ -2255,10 +2256,9 @@ done
# Mac OS X ships with a broken assembler
roms=
-probe_target_compiler i386-softmmu
-if test -n "$target_cc" &&
- test "$targetos" != "darwin" && test "$targetos" != "sunos" && \
- test "$targetos" != "haiku" && test "$softmmu" = yes ; then
+if test "$targetos" != "darwin" && test "$targetos" != "sunos" && \
+ test "$targetos" != "haiku" && test "$softmmu" = yes && \
+ probe_target_compiler i386-softmmu; then
roms="pc-bios/optionrom"
config_mak=pc-bios/optionrom/config.mak
echo "# Automatically generated by configure - do not modify" > $config_mak
@@ -2266,8 +2266,7 @@ if test -n "$target_cc" &&
write_target_makefile >> $config_mak
fi
-probe_target_compiler ppc-softmmu
-if test -n "$target_cc" && test "$softmmu" = yes; then
+if test "$softmmu" = yes && probe_target_compiler ppc-softmmu; then
roms="$roms pc-bios/vof"
config_mak=pc-bios/vof/config.mak
echo "# Automatically generated by configure - do not modify" > $config_mak
@@ -2277,8 +2276,7 @@ fi
# Only build s390-ccw bios if the compiler has -march=z900 or -march=z10
# (which is the lowest architecture level that Clang supports)
-probe_target_compiler s390x-softmmu
-if test -n "$target_cc" && test "$softmmu" = yes; then
+if test "$softmmu" = yes && probe_target_compiler s390x-softmmu; then
write_c_skeleton
do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c $TMPC
has_z900=$?