From 8c28a2da7832f1928861bc84ba85788010611cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 21 Feb 2020 23:34:22 +0100 Subject: [PATCH] CONFIGURE: Add an environemt variable that discards the --host option In the previous commit we modified the configure script to silently ignore some options, that are not needed for ScummVM, but are valid for the configure script generated by GNU Autotools, so the configure macro for RPM-based distributions can be used when building a rpm package for them. Unfortunately the configure script, as used by ScummVM uses the --host option to determine the target system it will actually be build for. Autotools based configure scripts have a --target option for such a purpose, and use the --host option to determine the system the build is performed on. For that reason there should be a way to discard the parameters passed to the configure script with the --host option. The easiest approach to achieve this goal, is to have an environment variable, which when set influences the configure script to ignore the parameters of the --host option. Thus we introduced a variable called 'CONFIGURE_NO_HOST', that will when set to anything, but an empty value, before invoking the configure script, have the parameters of the --host option take no influence on the configure stage (and the build stage as well). --- configure | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 89cf2ab5988b..d3bd5eda4781 100755 --- a/configure +++ b/configure @@ -1155,6 +1155,7 @@ Some influential environment variables: AR archiver command AS assembler command ASFLAGS assembler flags + CONFIGURE_NO_HOST Ignore the cross-compile target set by the --host= option CPPFLAGS C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CXX C++ compiler command @@ -1474,7 +1475,11 @@ for ac_option in $@; do _xcodetoolspath=`echo $ac_option | cut -d '=' -f 2` ;; --host=*) - _host=`echo $ac_option | cut -d '=' -f 2` + if test -z "$CONFIGURE_NO_HOST"; then + _host=`echo $ac_option | cut -d '=' -f 2` + else + echo "Ignoring --host option!" >&2 + fi ;; --prefix=*) prefix=`echo $ac_option | cut -d '=' -f 2`