diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-21 02:44:53 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-24 02:15:03 +0100 |
| commit | af4c5d3ea1ec5d140b9477feea2cb9487977a6c4 (patch) | |
| tree | 40f8e75f4c6aee6d8a8bfe89025b807a3db135c1 /configure.ac | |
| parent | 4e2e57b530544736804ab663f832173ba1d78559 (diff) | |
Enforce cross-compilation for static builds
... AKA DISABLE_DYNLOADING, except for oss-fuzz, which will be
converted to a cross build in a follow-up patch.
This includes skipping the static registry and help tooling and
aborts configure when the ODK is selected to be build.
Change-Id: Ifae32e91acf5e9ffa234d8f915ee459b197091fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127287
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index a33f91557e5e..2d50a9907469 100644 --- a/configure.ac +++ b/configure.ac @@ -3799,9 +3799,9 @@ if test -n "$WIN_MULTI_ARCH" -a -n "$WIN_OTHER_ARCH"; then fi -if test "$_os" = "iOS" -o "$build_cpu" != "$host_cpu"; then +if test "$build_cpu" != "$host_cpu" -o \( "$DISABLE_DYNLOADING" = TRUE -a "$enable_fuzzers" != yes \); then # To allow building Windows multi-arch releases without cross-tooling - if test -z "$WIN_MULTI_ARCH" -a -z "$WIN_OTHER_ARCH"; then + if test "$DISABLE_DYNLOADING" = TRUE -o \( -z "$WIN_MULTI_ARCH" -a -z "$WIN_OTHER_ARCH" \); then cross_compiling="yes" fi fi @@ -5372,7 +5372,7 @@ else fi AC_MSG_CHECKING([if we need to build the help index tooling]) -if test "$with_help" = yes -o "$enable_extension_integration" != no; then +if test \( "$with_help" = yes -o "$enable_extension_integration" != no \) -a -z "$DISABLE_DYNLOADING"; then BUILD_TYPE="$BUILD_TYPE HELPTOOLS" test_clucene=yes AC_MSG_RESULT([yes]) @@ -9005,6 +9005,17 @@ AC_SUBST(ENABLE_LWP) dnl =================================================================== dnl Check for building ODK dnl =================================================================== +AC_MSG_CHECKING([whether to build the ODK]) +if test "$enable_odk" = yes; then + if test "$DISABLE_DYNLOADING" = TRUE; then + AC_MSG_ERROR([can't build ODK for --disable-dynamic-loading builds]) + fi + AC_MSG_RESULT([yes]) + BUILD_TYPE="$BUILD_TYPE ODK" +else + AC_MSG_RESULT([no]) +fi + if test "$enable_odk" != yes; then unset DOXYGEN else @@ -9039,14 +9050,6 @@ else fi AC_SUBST([DOXYGEN]) -AC_MSG_CHECKING([whether to build the ODK]) -if test "$enable_odk" = yes; then - AC_MSG_RESULT([yes]) - BUILD_TYPE="$BUILD_TYPE ODK" -else - AC_MSG_RESULT([no]) -fi - dnl ================================================================== dnl libfuzzer dnl ================================================================== |