| Message ID | 20201108052605.45840-3-j@getutm.app |
|---|---|
| State | New |
| Headers | show |
| Series | iOS and Apple Silicon host support | expand |
On 08/11/2020 06.26, Joelle van Dyne wrote: > 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. > > 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 97a879808d..fda7a875f7 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="" > @@ -458,6 +459,7 @@ for opt do > optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)') > case "$opt" in > --cross-prefix=*) cross_prefix="$optarg" > + cross_compile="yes" > ;; > --cc=*) CC="$optarg" > ;; > @@ -1657,7 +1659,7 @@ $(echo Available targets: $default_target_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 > @@ -6933,7 +6935,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 > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/configure b/configure index 97a879808d..fda7a875f7 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="" @@ -458,6 +459,7 @@ for opt do optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)') case "$opt" in --cross-prefix=*) cross_prefix="$optarg" + cross_compile="yes" ;; --cc=*) CC="$optarg" ;; @@ -1657,7 +1659,7 @@ $(echo Available targets: $default_target_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 @@ -6933,7 +6935,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
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. Signed-off-by: Joelle van Dyne <j@getutm.app> --- configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)