From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: Ed Maste <emaste@freebsd.org>, Li-Wen Hsu <lwhsu@freebsd.org>
Subject: [PULL 7/8] configure: Add system = 'linux' for meson when cross-compiling
Date: Tue, 1 Sep 2020 17:20:49 +0200 [thread overview]
Message-ID: <20200901152050.255165-8-thuth@redhat.com> (raw)
In-Reply-To: <20200901152050.255165-1-thuth@redhat.com>
Meson needs the "system = xyz" line when cross-compiling. We are already
adding a "system = 'windows'" for the MinGW cross-compilation case here,
so let's add a "system = 'linux'" now for Linux hosts, too.
Message-Id: <20200823111757.72002-2-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
configure | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure b/configure
index 59b7310e15..85461976b5 100755
--- a/configure
+++ b/configure
@@ -8194,6 +8194,9 @@ if test -n "$cross_prefix"; then
?:*) pre_prefix=/ ;;
esac
fi
+ if test "$linux" = "yes" ; then
+ echo "system = 'linux'" >> $cross
+ fi
case "$ARCH" in
i386|x86_64)
echo "cpu_family = 'x86'" >> $cross
--
2.18.2
next prev parent reply other threads:[~2020-09-01 15:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 15:20 [PULL 0/8] Cirrus-CI improvements, and other CI-related fixes, m68k Thomas Huth
2020-09-01 15:20 ` [PULL 1/8] configure: Fix atomic64 test for --enable-werror on macOS Thomas Huth
2020-09-01 15:20 ` [PULL 2/8] cirrus.yml: Compile FreeBSD with -Werror Thomas Huth
2020-09-01 15:20 ` [PULL 3/8] cirrus.yml: Compile macOS " Thomas Huth
2020-09-01 15:20 ` [PULL 4/8] cirrus.yml: Update the macOS jobs to Catalina Thomas Huth
2020-09-01 15:20 ` [PULL 5/8] cirrus.yml: Split FreeBSD job into two parts Thomas Huth
2020-09-01 15:20 ` [PULL 6/8] meson: fix keymaps without qemu-keymap Thomas Huth
2020-09-01 15:20 ` Thomas Huth [this message]
2020-09-01 15:20 ` [PULL 8/8] hw/m68k: QOMify the mcf5206 system integration module Thomas Huth
2020-09-02 12:56 ` [PULL 0/8] Cirrus-CI improvements, and other CI-related fixes, m68k Peter Maydell
2020-09-02 14:13 ` Thomas Huth
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=20200901152050.255165-8-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=emaste@freebsd.org \
--cc=lwhsu@freebsd.org \
--cc=peter.maydell@linaro.org \
--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).