[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 2/7] configure: cross-compiling with empty cross_prefix
From: |
Joelle van Dyne |
Subject: |
[PATCH v6 2/7] configure: cross-compiling with empty cross_prefix |
Date: |
Mon, 4 Jan 2021 18:20:50 -0800 |
The iOS toolchain does not use the host prefix naming convention. So we
need to enable cross-compile options while allowing the PREFIX to be
blank.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Joelle van Dyne <j@getutm.app>
---
configure | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 7cd2ee0b9c..744d1990be 100755
--- a/configure
+++ b/configure
@@ -234,6 +234,7 @@ cpu=""
iasl="iasl"
interp_prefix="/usr/gnemul/qemu-%M"
static="no"
+cross_compile="no"
cross_prefix=""
audio_drv_list=""
block_drv_rw_whitelist=""
@@ -461,6 +462,7 @@ for opt do
optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)')
case "$opt" in
--cross-prefix=*) cross_prefix="$optarg"
+ cross_compile="yes"
;;
--cc=*) CC="$optarg"
;;
@@ -1674,7 +1676,7 @@ $(echo Deprecated targets: $deprecated_targets_list | \
--target-list-exclude=LIST exclude a set of targets from the default
target-list
Advanced options (experts only):
- --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]
+ --cross-prefix=PREFIX use PREFIX for compile tools, PREFIX can be blank
[$cross_prefix]
--cc=CC use C compiler CC [$cc]
--iasl=IASL use ACPI compiler IASL [$iasl]
--host-cc=CC use C compiler CC [$host_cc] for code run at
@@ -6963,7 +6965,7 @@ if has $sdl2_config; then
fi
echo "strip = [$(meson_quote $strip)]" >> $cross
echo "windres = [$(meson_quote $windres)]" >> $cross
-if test -n "$cross_prefix"; then
+if test "$cross_compile" = "yes"; then
cross_arg="--cross-file config-meson.cross"
echo "[host_machine]" >> $cross
if test "$mingw32" = "yes" ; then
--
2.28.0
- [PATCH v6 0/7] iOS and Apple Silicon host support, Joelle van Dyne, 2021/01/04
- [PATCH v6 1/7] configure: option to disable host block devices, Joelle van Dyne, 2021/01/04
- [PATCH v6 2/7] configure: cross-compiling with empty cross_prefix,
Joelle van Dyne <=
- [PATCH v6 6/7] slirp: update build flags for iOS resolv fix, Joelle van Dyne, 2021/01/04
- [PATCH v6 4/7] coroutine: add libucontext as external library, Joelle van Dyne, 2021/01/04
- [PATCH v6 5/7] configure: cross compile should use x86_64 cpu_family, Joelle van Dyne, 2021/01/04
- [PATCH v6 3/7] qemu: add support for iOS host, Joelle van Dyne, 2021/01/04