OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

configure: remove boolean variables for targets

Browse Source 
Just use $targetos always.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-08-30 11:15:07 +02:00
parent 6e0dc9d2a8
commit 80100e267a
1 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
configure vendored
View File

@ -374,45 +374,14 @@ fi
# OS specific # OS specific
mingw32="no"
bsd="no"
linux="no"
solaris="no"
case $targetos in case $targetos in
windows) windows)
mingw32="yes"
plugins="no" plugins="no"
pie="no" pie="no"
;; ;;
gnu/kfreebsd)
bsd="yes"
;;
freebsd)
bsd="yes"
# needed for kinfo_getvmmap(3) in libutil.h
;;
dragonfly)
bsd="yes"
;;
netbsd)
bsd="yes"
;;
openbsd)
bsd="yes"
;;
darwin)
bsd="yes"
darwin="yes"
;;
sunos)
solaris="yes"
;;
haiku) haiku)
pie="no" pie="no"
;; ;;
linux)
linux="yes"
;;
esac esac
if test ! -z "$cpu" ; then if test ! -z "$cpu" ; then
@ -627,7 +596,7 @@ do
fi fi
done done
if test "$mingw32" = "yes" ; then if test "$targetos" = "windows" ; then
EXESUF=".exe" EXESUF=".exe"
prefix="/qemu" prefix="/qemu"
bindir="" bindir=""
@ -809,7 +778,7 @@ for opt do
;; ;;
--enable-download) download="enabled"; git_submodules_action=update; --enable-download) download="enabled"; git_submodules_action=update;
;; ;;
--enable-plugins) if test "$mingw32" = "yes"; then --enable-plugins) if test "$targetos" = "windows"; then
error_exit "TCG plugins not currently supported on Windows platforms" error_exit "TCG plugins not currently supported on Windows platforms"
else else
plugins="yes" plugins="yes"
@ -1080,7 +1049,7 @@ fi
# by default. Only enable by default for git builds # by default. Only enable by default for git builds
if test -z "$werror" ; then if test -z "$werror" ; then
if test -e "$source_path/.git" && \ if test -e "$source_path/.git" && \
{ test "$linux" = "yes" || test "$mingw32" = "yes"; }; then { test "$targetos" = linux || test "$targetos" = "windows"; }; then
werror="yes" werror="yes"
else else
werror="no" werror="no"
@ -1718,7 +1687,7 @@ echo all: >> $config_host_mak
if test "$debug_tcg" = "yes" ; then if test "$debug_tcg" = "yes" ; then
echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak
fi fi
if test "$mingw32" = "yes" ; then if test "$targetos" = "windows"; then
echo "CONFIG_WIN32=y" >> $config_host_mak echo "CONFIG_WIN32=y" >> $config_host_mak
echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER-QEMU}" >> $config_host_mak echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER-QEMU}" >> $config_host_mak
echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO-Linux}" >> $config_host_mak echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO-Linux}" >> $config_host_mak
@ -1727,24 +1696,26 @@ else
echo "CONFIG_POSIX=y" >> $config_host_mak echo "CONFIG_POSIX=y" >> $config_host_mak
fi fi
if test "$linux" = "yes" ; then if test "$targetos" = "linux" ; then
echo "CONFIG_LINUX=y" >> $config_host_mak echo "CONFIG_LINUX=y" >> $config_host_mak
fi fi
if test "$darwin" = "yes" ; then if test "$targetos" = "darwin" ; then
echo "CONFIG_DARWIN=y" >> $config_host_mak echo "CONFIG_DARWIN=y" >> $config_host_mak
fi fi
if test "$solaris" = "yes" ; then if test "$targetos" = "sunos" ; then
echo "CONFIG_SOLARIS=y" >> $config_host_mak echo "CONFIG_SOLARIS=y" >> $config_host_mak
fi fi
echo "SRC_PATH=$source_path" >> $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak
echo "TARGET_DIRS=$target_list" >> $config_host_mak echo "TARGET_DIRS=$target_list" >> $config_host_mak
# XXX: suppress that # XXX: suppress that
if [ "$bsd" = "yes" ] ; then case $targetos in
echo "CONFIG_BSD=y" >> $config_host_mak gnu/kfreebsd | freebsd | dragonfly | netbsd | openbsd | darwin)
fi echo "CONFIG_BSD=y" >> $config_host_mak
;;
esac
if test "$plugins" = "yes" ; then if test "$plugins" = "yes" ; then
echo "CONFIG_PLUGIN=y" >> $config_host_mak echo "CONFIG_PLUGIN=y" >> $config_host_mak
@ -1774,7 +1745,7 @@ echo "CC=$cc" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak
# use included Linux headers for KVM architectures # use included Linux headers for KVM architectures
if test "$linux" = "yes" && test -n "$linux_arch"; then if test "$targetos" = "linux" && test -n "$linux_arch"; then
symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm
fi fi