mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 07:22:46 +00:00
move computation of tools and roms outside of config-host.mak generation
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
parent
683035de78
commit
ca35f780ac
40
configure
vendored
40
configure
vendored
|
@ -1991,6 +1991,27 @@ fi
|
||||||
|
|
||||||
confdir=$sysconfdir$confsuffix
|
confdir=$sysconfdir$confsuffix
|
||||||
|
|
||||||
|
tools=
|
||||||
|
if test "$softmmu" = yes ; then
|
||||||
|
tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
|
||||||
|
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
|
||||||
|
tools="qemu-nbd\$(EXESUF) $tools"
|
||||||
|
if [ "$check_utests" = "yes" ]; then
|
||||||
|
tools="check-qint check-qstring check-qdict check-qlist $tools"
|
||||||
|
tools="check-qfloat check-qjson $tools"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Mac OS X ships with a broken assembler
|
||||||
|
roms=
|
||||||
|
if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
|
||||||
|
"$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \
|
||||||
|
"$softmmu" = yes ; then
|
||||||
|
roms="optionrom"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
echo "Install prefix $prefix"
|
echo "Install prefix $prefix"
|
||||||
echo "BIOS directory `eval echo $datadir`"
|
echo "BIOS directory `eval echo $datadir`"
|
||||||
echo "binary directory `eval echo $bindir`"
|
echo "binary directory `eval echo $bindir`"
|
||||||
|
@ -2293,26 +2314,7 @@ bsd)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
tools=
|
|
||||||
if test "$softmmu" = yes ; then
|
|
||||||
tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
|
|
||||||
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
|
|
||||||
tools="qemu-nbd\$(EXESUF) $tools"
|
|
||||||
if [ "$check_utests" = "yes" ]; then
|
|
||||||
tools="check-qint check-qstring check-qdict check-qlist $tools"
|
|
||||||
tools="check-qfloat check-qjson $tools"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
echo "TOOLS=$tools" >> $config_host_mak
|
echo "TOOLS=$tools" >> $config_host_mak
|
||||||
|
|
||||||
# Mac OS X ships with a broken assembler
|
|
||||||
roms=
|
|
||||||
if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
|
|
||||||
"$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \
|
|
||||||
"$softmmu" = yes ; then
|
|
||||||
roms="optionrom"
|
|
||||||
fi
|
|
||||||
echo "ROMS=$roms" >> $config_host_mak
|
echo "ROMS=$roms" >> $config_host_mak
|
||||||
echo "MAKE=$make" >> $config_host_mak
|
echo "MAKE=$make" >> $config_host_mak
|
||||||
echo "INSTALL=$install" >> $config_host_mak
|
echo "INSTALL=$install" >> $config_host_mak
|
||||||
|
|
Loading…
Reference in a new issue