Repository.mk | 2 +- configure.ac | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-)
New commits: commit 1a366ebfdadec97807482c4ea53f45fa9f466741 Author: Jan-Marek Glogowski <[email protected]> AuthorDate: Wed Sep 2 15:32:44 2020 +0200 Commit: Jan-Marek Glogowski <[email protected]> CommitDate: Fri Sep 18 10:13:30 2020 +0200 twain32shim: disable for Windows Arm64 build I know the platform can emulate x86 code, but have no idea, if this would include x86 TWAIN32 drivers, so disable the build for now. Change-Id: I22cb2ab81ade9f91097586f382cdd4855e27d827 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102955 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <[email protected]> diff --git a/Repository.mk b/Repository.mk index 06f8588e2a19..9641b3bddd10 100644 --- a/Repository.mk +++ b/Repository.mk @@ -151,7 +151,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ unoinfo \ unopkg \ unopkg_com \ - twain32shim \ + $(if $(filter-out ARM64,$(CPUNAME)),twain32shim) \ ) \ )) diff --git a/configure.ac b/configure.ac index be73281b3e05..bacae1c9a9b3 100644 --- a/configure.ac +++ b/configure.ac @@ -3814,7 +3814,8 @@ if test "$_os" = "WINNT"; then # Check for 32-bit compiler to use to build the 32-bit TWAIN shim # needed to support TWAIN scan on both 32- and 64-bit systems - if test "$WIN_HOST_ARCH" = "x64"; then + case "$WIN_HOST_ARCH" in + x64) AC_MSG_CHECKING([for a x86 compiler and libraries for 32-bit binaries required for TWAIN support]) if test -n "$WIN_MULTI_ARCH"; then BUILD_X86=TRUE @@ -3825,10 +3826,12 @@ if test "$_os" = "WINNT"; then AC_MSG_RESULT([not found]) AC_MSG_WARN([Installation set will not contain 32-bit binaries required for TWAIN support]) fi - else + ;; + x86) BUILD_X86=TRUE CXX_X86_BINARY=$MSVC_CXX - fi + ;; + esac AC_SUBST(BUILD_X86) AC_SUBST(CXX_X86_BINARY) fi _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
