From f96b0b9c7d4deb9aee4898ffbbf03efa761bf342 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Fri, 2 Oct 2020 16:50:31 +0200 Subject: odk: fix Windows Arm64 build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I didn't change odk/util/check.pl to handle the currently missing climaker. I hope this problem will eventually be fixed before anybody really considers developing with LO ODK on Arm64... Change-Id: Icc070bde77e73362646d62401410277a85d3d697 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103879 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- unoidl/Module_unoidl.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'unoidl/Module_unoidl.mk') diff --git a/unoidl/Module_unoidl.mk b/unoidl/Module_unoidl.mk index e158e125c894..a8b8ba14d2e5 100644 --- a/unoidl/Module_unoidl.mk +++ b/unoidl/Module_unoidl.mk @@ -9,14 +9,17 @@ $(eval $(call gb_Module_Module,unoidl)) +# Executable_unoidl-check: !CROSS || ODK => !(CROSS && !ODK) + $(eval $(call gb_Module_add_targets,unoidl, \ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ Executable_unoidl-read) \ + $(if $(and $(CROSS_COMPILING),$(filter-out ODK,$(BUILD_TYPE))),, \ + Executable_unoidl-check) \ Library_unoidl \ )) $(eval $(call gb_Module_add_targets_for_build,unoidl, \ - Executable_unoidl-check \ Executable_unoidl-write \ )) -- cgit v1.2.3