qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PATCH 09/10] configure: remove $linux and $mingw32 variables
Date: Tue, 29 Aug 2023 10:29:30 +0200	[thread overview]
Message-ID: <20230829082931.67601-10-pbonzini@redhat.com> (raw)
In-Reply-To: <20230829082931.67601-1-pbonzini@redhat.com>

Just use $targetos always.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index eba5befa2cf..aed48db68fd 100755
--- a/configure
+++ b/configure
@@ -374,12 +374,9 @@ fi
 
 # OS specific
 
-mingw32="no"
 bsd="no"
-linux="no"
 case $targetos in
 windows)
-  mingw32="yes"
   plugins="no"
   pie="no"
 ;;
@@ -405,9 +402,6 @@ darwin)
 haiku)
   pie="no"
 ;;
-linux)
-  linux="yes"
-;;
 esac
 
 if test ! -z "$cpu" ; then
@@ -622,7 +616,7 @@ do
     fi
 done
 
-if test "$mingw32" = "yes" ; then
+if test "$targetos" = "windows" ; then
   EXESUF=".exe"
   prefix="/qemu"
   bindir=""
@@ -805,7 +799,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"
@@ -1070,7 +1064,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"
@@ -1708,7 +1702,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
@@ -1717,7 +1711,7 @@ 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
 
@@ -1755,7 +1749,7 @@ echo "NINJA=$ninja" >> $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



  parent reply	other threads:[~2023-08-29  8:30 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-29  8:29 [PATCH 00/10] configure cleanups for QEMU 8.2 Paolo Bonzini
2023-08-29  8:29 ` [PATCH 01/10] meson: do not unnecessarily use cmake for dependencies Paolo Bonzini
2023-08-29 17:14   ` Daniel P. Berrangé
2023-08-29  8:29 ` [PATCH 02/10] meson: update unsupported host/CPU messages Paolo Bonzini
2023-08-29 10:34   ` Daniel P. Berrangé
2023-08-31  8:20     ` Paolo Bonzini
2023-08-31  8:51       ` Daniel P. Berrangé
2023-08-29  8:29 ` [PATCH 03/10] configure: remove HOST_CC Paolo Bonzini
2023-08-29 17:12   ` Daniel P. Berrangé
2023-08-29 18:40   ` Richard Henderson
2023-08-29  8:29 ` [PATCH 04/10] configure: create native file with contents of $host_cc Paolo Bonzini
2023-08-29 16:54   ` Peter Maydell
2023-08-29 17:14   ` Daniel P. Berrangé
2023-08-31  8:26     ` Paolo Bonzini
2023-08-29 18:45   ` Richard Henderson
2023-08-29  8:29 ` [PATCH 05/10] meson: compile bundled device trees Paolo Bonzini
2023-08-29 14:25   ` Philippe Mathieu-Daudé
2023-08-29 18:48     ` Richard Henderson
2023-08-29 18:47   ` Richard Henderson
2023-08-29  8:29 ` [PATCH 06/10] contrib/plugins: use an independent makefile Paolo Bonzini
2023-08-29 17:16   ` Daniel P. Berrangé
2023-08-29  8:29 ` [PATCH 07/10] meson: do not use config_host to pick tap implementations Paolo Bonzini
2023-08-29 14:26   ` Philippe Mathieu-Daudé
2023-08-29 17:05   ` Daniel P. Berrangé
2023-08-29  8:29 ` [PATCH 08/10] configure, meson: move simple OS definitions to meson Paolo Bonzini
2023-08-29 14:28   ` Philippe Mathieu-Daudé
2023-08-29  8:29 ` Paolo Bonzini [this message]
2023-08-29 14:28   ` [PATCH 09/10] configure: remove $linux and $mingw32 variables Philippe Mathieu-Daudé
2023-08-29 17:05   ` Daniel P. Berrangé
2023-08-29  8:29 ` [PATCH 10/10] configure: move --enable-debug-tcg to meson Paolo Bonzini
2023-08-29 16:57   ` Peter Maydell
2023-08-29 18:52   ` Richard Henderson
2023-08-31  8:17   ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230829082931.67601-10-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).