diff mbox series

[12/22] configure: tell meson and contrib_plugins about DLLTOOL

Message ID 20231106185112.2755262-13-alex.bennee@linaro.org
State Superseded
Headers show
Series Maintainer updates for 8.2 (gdbstub, tests, plugins) pre-PR | expand

Commit Message

Alex Bennée Nov. 6, 2023, 6:51 p.m. UTC 
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(+)

Comments

Paolo Bonzini Nov. 7, 2023, 9:32 a.m. UTC | #1 
On 11/6/23 19:51, Alex Bennée wrote:
> 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>

Reviewed-by: Paolo Bonzini <pbonzini@redhat.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
Philippe Mathieu-Daudé Nov. 7, 2023, 10:09 a.m. UTC | #2 
On 6/11/23 19:51, Alex Bennée wrote:
> 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(+)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff mbox series

Patch

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