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 --- odk/CustomTarget_check.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'odk/CustomTarget_check.mk') diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index b9dc8d358072..69b99a9e4ce8 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -28,7 +28,8 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),windows,\ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ $(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_doxygen)) \ - $(foreach exe,$(if $(filter WNT,$(OS)),climaker) cppumaker idlc javamaker $(if $(SYSTEM_UCPP),,ucpp) uno-skeletonmaker unoapploader unoidl-check,\ + $(foreach exe,$(if $(filter WNT,$(OS)),$(if $(filter-out ARM64,$(CPUNAME)),climaker)) cppumaker \ + idlc javamaker $(if $(SYSTEM_UCPP),,ucpp) uno-skeletonmaker unoapploader unoidl-check,\ $(call gb_Executable_get_target,$(exe))) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(call gb_Package_get_target,odk_config) \ -- cgit