[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 25/51] configure: remove boolean variables for targets
From: |
Paolo Bonzini |
Subject: |
[PULL 25/51] configure: remove boolean variables for targets |
Date: |
Thu, 7 Sep 2023 14:59:34 +0200 |
Just use $targetos always.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 55 +++++++++++++------------------------------------------
1 file changed, 13 insertions(+), 42 deletions(-)
diff --git a/configure b/configure
index 378a0de9fb6..f96f7359a83 100755
--- a/configure
+++ b/configure
@@ -374,45 +374,14 @@ fi
# OS specific
-mingw32="no"
-bsd="no"
-linux="no"
-solaris="no"
case $targetos in
windows)
- mingw32="yes"
plugins="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)
pie="no"
;;
-linux)
- linux="yes"
-;;
esac
if test ! -z "$cpu" ; then
@@ -627,7 +596,7 @@ do
fi
done
-if test "$mingw32" = "yes" ; then
+if test "$targetos" = "windows" ; then
EXESUF=".exe"
prefix="/qemu"
bindir=""
@@ -809,7 +778,7 @@ for opt do
;;
--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"
else
plugins="yes"
@@ -1080,7 +1049,7 @@ fi
# by default. Only enable by default for git builds
if test -z "$werror" ; then
if test -e "$source_path/.git" && \
- { test "$linux" = "yes" || test "$mingw32" = "yes"; }; then
+ { test "$targetos" = linux || test "$targetos" = "windows"; }; then
werror="yes"
else
werror="no"
@@ -1718,7 +1687,7 @@ echo all: >> $config_host_mak
if test "$debug_tcg" = "yes" ; then
echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak
fi
-if test "$mingw32" = "yes" ; then
+if test "$targetos" = "windows"; then
echo "CONFIG_WIN32=y" >> $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
@@ -1727,24 +1696,26 @@ else
echo "CONFIG_POSIX=y" >> $config_host_mak
fi
-if test "$linux" = "yes" ; then
+if test "$targetos" = "linux" ; then
echo "CONFIG_LINUX=y" >> $config_host_mak
fi
-if test "$darwin" = "yes" ; then
+if test "$targetos" = "darwin" ; then
echo "CONFIG_DARWIN=y" >> $config_host_mak
fi
-if test "$solaris" = "yes" ; then
+if test "$targetos" = "sunos" ; then
echo "CONFIG_SOLARIS=y" >> $config_host_mak
fi
echo "SRC_PATH=$source_path" >> $config_host_mak
echo "TARGET_DIRS=$target_list" >> $config_host_mak
# XXX: suppress that
-if [ "$bsd" = "yes" ] ; then
- echo "CONFIG_BSD=y" >> $config_host_mak
-fi
+case $targetos in
+ gnu/kfreebsd | freebsd | dragonfly | netbsd | openbsd | darwin)
+ echo "CONFIG_BSD=y" >> $config_host_mak
+ ;;
+esac
if test "$plugins" = "yes" ; then
echo "CONFIG_PLUGIN=y" >> $config_host_mak
@@ -1774,7 +1745,7 @@ echo "CC=$cc" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
# 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
fi
--
2.41.0
- [PULL 08/51] os-posix.c: create and export os_set_chroot(), (continued)
- [PULL 08/51] os-posix.c: create and export os_set_chroot(), Paolo Bonzini, 2023/09/07
- [PULL 10/51] os-posix.c: move code around, Paolo Bonzini, 2023/09/07
- [PULL 09/51] os-posix.c, softmmu/vl.c: move os_parse_cmd_args() into qemu_init(), Paolo Bonzini, 2023/09/07
- [PULL 14/51] contrib/plugins: remove -soname argument, Paolo Bonzini, 2023/09/07
- [PULL 07/51] os-posix.c: create and export os_set_runas(), Paolo Bonzini, 2023/09/07
- [PULL 12/51] softmmu/vl.c: inline include/qemu/qemu-options.h into vl.c, Paolo Bonzini, 2023/09/07
- [PULL 15/51] contrib/plugins/cache: Fix string format, Paolo Bonzini, 2023/09/07
- [PULL 17/51] contrib/plugins/howvec: Fix string format, Paolo Bonzini, 2023/09/07
- [PULL 16/51] contrib/plugins/drcov: Fix string format, Paolo Bonzini, 2023/09/07
- [PULL 21/51] meson: update unsupported host/CPU messages, Paolo Bonzini, 2023/09/07
- [PULL 25/51] configure: remove boolean variables for targets,
Paolo Bonzini <=
- [PULL 11/51] os-posix.c: remove unneeded #includes, Paolo Bonzini, 2023/09/07
- [PULL 20/51] meson: do not unnecessarily use cmake for dependencies, Paolo Bonzini, 2023/09/07
- [PULL 24/51] meson: compile bundled device trees, Paolo Bonzini, 2023/09/07
- Re: [PULL 24/51] meson: compile bundled device trees, Philippe Mathieu-Daudé, 2023/09/08
- Re: [PULL 24/51] meson: compile bundled device trees, Michael Tokarev, 2023/09/08
- Re: [PULL 24/51] meson: compile bundled device trees, BALATON Zoltan, 2023/09/08
- Re: [PULL 24/51] meson: compile bundled device trees, Michael Tokarev, 2023/09/08
- Re: [PULL 24/51] meson: compile bundled device trees, BALATON Zoltan, 2023/09/08
- Re: [PULL 24/51] meson: compile bundled device trees, Philippe Mathieu-Daudé, 2023/09/11
- Re: [PULL 24/51] meson: compile bundled device trees, Peter Maydell, 2023/09/11