[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 02/11] configure: cross-compiling with empty cross_prefix
From: |
Joelle van Dyne |
Subject: |
[PATCH v7 02/11] configure: cross-compiling with empty cross_prefix |
Date: |
Fri, 22 Jan 2021 12:11:04 -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 acf7f7414a..32be5d225d 100755
--- a/configure
+++ b/configure
@@ -238,6 +238,7 @@ cpu=""
iasl="iasl"
interp_prefix="/usr/gnemul/qemu-%M"
static="no"
+cross_compile="no"
cross_prefix=""
audio_drv_list=""
block_drv_rw_whitelist=""
@@ -469,6 +470,7 @@ for opt do
optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)')
case "$opt" in
--cross-prefix=*) cross_prefix="$optarg"
+ cross_compile="yes"
;;
--cc=*) CC="$optarg"
;;
@@ -1696,7 +1698,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
@@ -6403,7 +6405,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 v7 00/11] iOS and Apple Silicon host support, Joelle van Dyne, 2021/01/22
- [PATCH v7 01/11] block: feature detection for host block support, Joelle van Dyne, 2021/01/22
- [PATCH v7 02/11] configure: cross-compiling with empty cross_prefix,
Joelle van Dyne <=
- [PATCH v7 04/11] slirp: feature detection for smbd, Joelle van Dyne, 2021/01/22
- [PATCH v7 03/11] configure: check for sys/disk.h, Joelle van Dyne, 2021/01/22
- [PATCH v7 06/11] darwin: remove redundant dependency declaration, Joelle van Dyne, 2021/01/22
- [PATCH v7 07/11] darwin: fix cross-compiling for Darwin, Joelle van Dyne, 2021/01/22
- [PATCH v7 08/11] configure: cross compile should use x86_64 cpu_family, Joelle van Dyne, 2021/01/22