[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 008/142] configure: generate Meson cross file
From: |
Paolo Bonzini |
Subject: |
[PATCH 008/142] configure: generate Meson cross file |
Date: |
Tue, 28 Jan 2020 18:51:28 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/configure b/configure
index e3533b3290..cdc71631e0 100755
--- a/configure
+++ b/configure
@@ -8035,6 +8035,46 @@ echo "# Automatically generated by configure - do not
modify" > "$iotests_common
echo >> "$iotests_common_env"
echo "export PYTHON='$python'" >> "$iotests_common_env"
+cross="config-meson.cross"
+cross_arg=
+
+if test -n "$cross_prefix"; then
+ echo "# Automatically generated by configure - do not modify" > $cross
+ echo "[binaries]" >> $cross
+ echo "c = '$cc'" >> $cross
+ echo "cpp = '$cxx'" >> $cross
+ echo "ar = '$ar'" >> $cross
+ echo "nm = '$nm'" >> $cross
+ echo "pkgconfig = '$pkg_config_exe'" >> $cross
+ echo "ranlib = '$ranlib'" >> $cross
+ echo "strip = '$strip'" >> $cross
+ echo "windres = '$windres'" >> $cross
+
+ echo "[properties]" >> $cross
+ echo "root = '$prefix'" >> $cross
+
+ echo "[host_machine]" >> $cross
+if test "$mingw32" = "yes" ; then
+ echo "system = 'windows'" >> $cross
+fi
+case "$ARCH" in
+ i386|x86_64)
+ echo "cpu_family = 'x86'" >> $cross
+ ;;
+ *)
+ echo "cpu_family = '$ARCH'" >> $cross
+ ;;
+esac
+ echo "cpu = '$cpu'" >> $cross
+if test "$bigendian" = "yes" ; then
+ echo "endian = 'big'" >> $cross
+else
+ echo "endian = 'little'" >> $cross
+fi
+
+ cross_arg="--cross-file=$cross"
+fi
+
rm -rf meson-private meson-info meson-logs
NINJA=$PWD/ninjatool $python $meson setup \
--prefix "$prefix" \
@@ -8048,6 +8088,7 @@ NINJA=$PWD/ninjatool $python $meson setup \
--localstatedir "$local_statedir" \
$(test "$strip_opt" = yes && echo --strip) \
--buildtype $(if test "$debug" = yes; then echo debug; else echo
debugoptimized; fi) \
+ $cross_arg \
"$PWD" "$source_path"
if test "$?" -ne 0 ; then
--
2.21.0
- [RFC PATCH v4 000/142] Proof of concept for Meson integration, Paolo Bonzini, 2020/01/28
- [PATCH 002/142] optionrom: simplify Makefile, Paolo Bonzini, 2020/01/28
- [PATCH 003/142] pc-bios/s390-ccw: simplify Makefile, Paolo Bonzini, 2020/01/28
- [PATCH 004/142] build-sys hack: ensure target directory is there, Paolo Bonzini, 2020/01/28
- [PATCH 001/142] minikconf: accept alnum identifiers, Paolo Bonzini, 2020/01/28
- [PATCH 005/142] configure: do not include $(...) variables in config-host.mak, Paolo Bonzini, 2020/01/28
- [PATCH 006/142] configure: expand path variables for meson configure, Paolo Bonzini, 2020/01/28
- [PATCH 008/142] configure: generate Meson cross file,
Paolo Bonzini <=
- [PATCH 010/142] meson: enable pie, Paolo Bonzini, 2020/01/28
- [PATCH 009/142] build-sys: add meson submodule, Paolo Bonzini, 2020/01/28
- [PATCH 007/142] configure: integrate Meson in the build system, Paolo Bonzini, 2020/01/28
- [PATCH 011/142] meson: use coverage option, Paolo Bonzini, 2020/01/28
- [PATCH 012/142] meson: add testsuite Makefile generator, Paolo Bonzini, 2020/01/28
- [PATCH 014/142] meson: add remaining generated tcg trace helpers, Paolo Bonzini, 2020/01/28
- [PATCH 016/142] contrib/libvhost-user: convert to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 015/142] meson: add version.o, Paolo Bonzini, 2020/01/28
- [PATCH 017/142] contrib/vhost-user-blk: convert to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 018/142] contrib/vhost-user-scsi: convert to Meson, Paolo Bonzini, 2020/01/28