configure.ac | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
New commits: commit c0c937d1ff2a47c55b597e10c0f0055e5bfda7e0 Author: Jan-Marek Glogowski <[email protected]> AuthorDate: Thu Oct 28 11:56:16 2021 +0200 Commit: Jan-Marek Glogowski <[email protected]> CommitDate: Sun Oct 31 22:05:16 2021 +0100 Echo cross-toolset configure options ... just like autogen.sh does. Change-Id: I30ee6b4043c138d7c1e8de154b33fbc7528c34dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124439 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <[email protected]> diff --git a/configure.ac b/configure.ac index f2062daf62ac..cecc4993641f 100644 --- a/configure.ac +++ b/configure.ac @@ -5507,10 +5507,9 @@ if test "$cross_compiling" = "yes"; then test -n "$with_help" -a "$with_help" != "no" && sub_conf_opts="$sub_conf_opts --with-help=$with_help" test "$enable_extensions" = yes || sub_conf_opts="$sub_conf_opts --disable-extensions" test "$enable_wasm_strip" = "yes" && sub_conf_opts="$sub_conf_opts --enable-wasm-strip" - sub_conf_opts="$sub_conf_opts $with_build_platform_configure_options" # Don't bother having configure look for stuff not needed for the build platform anyway - ./configure \ + sub_conf_defaults=" \ --build="$build_alias" \ --disable-cairo-canvas \ --disable-cups \ @@ -5532,7 +5531,12 @@ if test "$cross_compiling" = "yes"; then --with-parallelism="$with_parallelism" \ --with-theme="$with_theme" \ --with-tls=openssl \ +" + echo " Running CONF-FOR-BUILD/configure" $sub_conf_defaults $sub_conf_opts $with_build_platform_configure_options --srcdir=$srcdir + ./configure \ + $sub_conf_defaults \ $sub_conf_opts \ + $with_build_platform_configure_options \ --srcdir=$srcdir \ 2>&1 | sed -e 's/^/ /' if test [${PIPESTATUS[0]}] -ne 0; then
