qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, "Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Laurent Vivier" <laurent@vivier.eu>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Mahmoud Mandour" <ma.mandourr@gmail.com>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Alexandre Iooss" <erdnaxe@crans.org>,
	"John Snow" <jsnow@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Chris Wulff" <crwulff@gmail.com>, "Marek Vasut" <marex@denx.de>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Greg Manning" <gmanning@rapitasystems.com>
Subject: [PATCH 12/22] configure: tell meson and contrib_plugins about DLLTOOL
Date: Mon,  6 Nov 2023 18:51:02 +0000	[thread overview]
Message-ID: <20231106185112.2755262-13-alex.bennee@linaro.org> (raw)
In-Reply-To: <20231106185112.2755262-1-alex.bennee@linaro.org>

To cleanly handle cross-building we need to export the details of
dlltool into meson's list of cross binaries and into the
contrib/plugins/ make configuration.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Greg Manning <gmanning@rapitasystems.com>
---
 configure | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configure b/configure
index f1456f6123..cd6c521bd8 100755
--- a/configure
+++ b/configure
@@ -309,6 +309,7 @@ fi
 ar="${AR-${cross_prefix}ar}"
 as="${AS-${cross_prefix}as}"
 ccas="${CCAS-$cc}"
+dlltool="${DLLTOOL-${cross_prefix}dlltool}"
 objcopy="${OBJCOPY-${cross_prefix}objcopy}"
 ld="${LD-${cross_prefix}ld}"
 ranlib="${RANLIB-${cross_prefix}ranlib}"
@@ -1659,6 +1660,9 @@ echo "SRC_PATH=$source_path/contrib/plugins" >> contrib/plugins/$config_host_mak
 echo "PKG_CONFIG=${pkg_config}" >> contrib/plugins/$config_host_mak
 echo "CC=$cc $CPU_CFLAGS" >> contrib/plugins/$config_host_mak
 echo "CFLAGS=${CFLAGS-$default_cflags} $EXTRA_CFLAGS" >> contrib/plugins/$config_host_mak
+if test "$targetos" = windows; then
+  echo "DLLTOOL=$dlltool" >> contrib/plugins/$config_host_mak
+fi
 if test "$targetos" = darwin; then
   echo "CONFIG_DARWIN=y" >> contrib/plugins/$config_host_mak
 fi
@@ -1764,6 +1768,7 @@ if test "$skip_meson" = no; then
   test -n "$cxx" && echo "cpp = [$(meson_quote $cxx $CPU_CFLAGS)]" >> $cross
   test -n "$objcc" && echo "objc = [$(meson_quote $objcc $CPU_CFLAGS)]" >> $cross
   echo "ar = [$(meson_quote $ar)]" >> $cross
+  echo "dlltool = [$(meson_quote $dlltool)]" >> $cross
   echo "nm = [$(meson_quote $nm)]" >> $cross
   echo "pkgconfig = [$(meson_quote $pkg_config)]" >> $cross
   echo "pkg-config = [$(meson_quote $pkg_config)]" >> $cross
@@ -1869,6 +1874,7 @@ preserve_env CC
 preserve_env CFLAGS
 preserve_env CXX
 preserve_env CXXFLAGS
+preserve_env DLLTOOL
 preserve_env LD
 preserve_env LDFLAGS
 preserve_env LD_LIBRARY_PATH
-- 
2.39.2



  parent reply	other threads:[~2023-11-06 18:54 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-06 18:50 [PATCH 00/22] Maintainer updates for 8.2 (gdbstub, tests, plugins) pre-PR Alex Bennée
2023-11-06 18:50 ` [PATCH 01/22] default-configs: Add TARGET_XML_FILES definition Alex Bennée
2023-11-07  3:28   ` Richard Henderson
2023-11-06 18:50 ` [PATCH 02/22] gdb-xml: fix duplicate register in arm-neon.xml Alex Bennée
2023-11-07 10:04   ` Philippe Mathieu-Daudé
2023-11-06 18:50 ` [PATCH 03/22] target/arm: hide the 32bit version of PAR from gdbstub Alex Bennée
2023-11-07  3:52   ` Richard Henderson
2023-11-07 10:21     ` Alex Bennée
2023-11-06 18:50 ` [PATCH 04/22] target/arm: hide all versions of DBGD[RS]AR " Alex Bennée
2023-11-07  3:30   ` Richard Henderson
2023-11-06 18:50 ` [PATCH 05/22] target/arm: hide aliased MIDR " Alex Bennée
2023-11-07 13:08   ` Peter Maydell
2023-11-06 18:50 ` [PATCH 06/22] tests/tcg: add an explicit gdbstub register tester Alex Bennée
2023-11-06 18:50 ` [PATCH 07/22] tests/avocado: update the tcg_plugins test Alex Bennée
2023-11-07  3:56   ` Richard Henderson
2023-11-06 18:50 ` [PATCH 08/22] gdbstub: Add num_regs member to GDBFeature Alex Bennée
2023-11-07 10:07   ` Philippe Mathieu-Daudé
2023-11-07 10:24     ` Alex Bennée
2023-11-07 12:41       ` Philippe Mathieu-Daudé
2023-11-06 18:50 ` [PATCH 09/22] gdbstub: Introduce gdb_find_static_feature() Alex Bennée
2023-11-06 18:51 ` [PATCH 10/22] gdbstub: Introduce GDBFeatureBuilder Alex Bennée
2023-11-06 18:51 ` [PATCH 11/22] cpu: Call plugin hooks only when ready Alex Bennée
2023-11-06 18:51 ` Alex Bennée [this message]
2023-11-07  9:32   ` [PATCH 12/22] configure: tell meson and contrib_plugins about DLLTOOL Paolo Bonzini
2023-11-07 10:09   ` Philippe Mathieu-Daudé
2023-11-06 18:51 ` [PATCH 13/22] plugins: add dllexport and dllimport to api funcs Alex Bennée
2023-11-07  9:33   ` Paolo Bonzini
2023-11-07 10:08   ` Philippe Mathieu-Daudé
2023-11-06 18:51 ` [PATCH 14/22] plugins: make test/example plugins work on windows Alex Bennée
2023-11-07  9:44   ` Paolo Bonzini
2023-11-07  9:55     ` Greg Manning
2023-11-07 12:43       ` Greg Manning
2023-11-08 11:58         ` Paolo Bonzini
2023-11-06 18:51 ` [PATCH 15/22] plugins: disable lockstep plugin " Alex Bennée
2023-11-07 10:10   ` Philippe Mathieu-Daudé
2023-11-06 18:51 ` [PATCH 16/22] plugins: allow plugins to be enabled " Alex Bennée
2023-11-07 10:11   ` Philippe Mathieu-Daudé
2023-11-06 18:51 ` [PATCH 17/22] contrib/gitdm: Add Rivos Inc to the domain map Alex Bennée
2023-11-06 18:51 ` [PATCH 18/22] contrib/gitdm: add domain-map for Cestc Alex Bennée
2023-11-06 18:51 ` [PATCH 19/22] contrib/gitdm: map HiSilicon to Huawei Alex Bennée
2023-11-06 18:51 ` [PATCH 20/22] contrib/gitdm: add Daynix to domain-map Alex Bennée
2023-11-06 18:51 ` [PATCH 21/22] mailmap: fixup some more corrupted author fields Alex Bennée
2023-11-06 18:51 ` [PATCH 22/22] Revert "tests/tcg/nios2: Re-enable linux-user tests" Alex Bennée
2023-11-06 21:58   ` Richard Henderson

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=20231106185112.2755262-13-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=berrange@redhat.com \
    --cc=bleal@redhat.com \
    --cc=crosa@redhat.com \
    --cc=crwulff@gmail.com \
    --cc=erdnaxe@crans.org \
    --cc=gmanning@rapitasystems.com \
    --cc=jsnow@redhat.com \
    --cc=laurent@vivier.eu \
    --cc=ma.mandourr@gmail.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=marex@denx.de \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    /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).