summaryrefslogtreecommitdiff
path: root/unoidl
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2020-10-02 16:50:31 +0200
committerCaolán McNamara <caolanm@redhat.com>2020-10-04 14:58:30 +0200
commitf96b0b9c7d4deb9aee4898ffbbf03efa761bf342 (patch)
treedce8098bf25eda19ceb098e451ba79cfe5575491 /unoidl
parent20879693c6d1c384eafee610d5185a5a00c8ee68 (diff)
odk: fix Windows Arm64 build
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 <caolanm@redhat.com>
Diffstat (limited to 'unoidl')
-rw-r--r--unoidl/Module_unoidl.mk5
1 files changed, 4 insertions, 1 deletions
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 \
))