diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-10-02 16:50:31 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-04 14:58:30 +0200 |
| commit | f96b0b9c7d4deb9aee4898ffbbf03efa761bf342 (patch) | |
| tree | dce8098bf25eda19ceb098e451ba79cfe5575491 | |
| parent | Replace "newlined" sed with tr (diff) | |
| download | core-f96b0b9c7d4deb9aee4898ffbbf03efa761bf342.tar.gz core-f96b0b9c7d4deb9aee4898ffbbf03efa761bf342.zip | |
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>
| -rw-r--r-- | Repository.mk | 4 | ||||
| -rw-r--r-- | odk/CustomTarget_check.mk | 3 | ||||
| -rw-r--r-- | odk/Module_odk.mk | 2 | ||||
| -rw-r--r-- | unoidl/Module_unoidl.mk | 5 |
4 files changed, 9 insertions, 5 deletions
diff --git a/Repository.mk b/Repository.mk index 1c11c61cb189..4e5d64efba34 100644 --- a/Repository.mk +++ b/Repository.mk @@ -78,7 +78,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ )) $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ - $(if $(filter MSC,$(COM)),climaker) \ + $(if $(filter MSC,$(COM)),$(if $(filter-out ARM64,$(CPUNAME)),climaker)) \ cppumaker \ idlc \ javamaker \ @@ -839,7 +839,7 @@ $(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ odk_share_readme \ odk_share_readme_generated \ - $(if $(filter WNT,$(OS)),odk_cli) \ + $(if $(filter WNT,$(OS)),$(if $(filter-out ARM64,$(CPUNAME)),odk_cli)) \ odk_config \ $(if $(filter WNT,$(OS)),odk_config_win) \ odk_docs \ 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) \ diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 410f8cf8ef1e..120d8a4c01bf 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -12,7 +12,6 @@ include $(SRCDIR)/odk/build-examples_common.mk $(eval $(call gb_Module_Module,odk)) $(eval $(call gb_Module_add_targets,odk,\ - $(if $(filter WNT,$(OS)),Package_cli) \ $(if $(DOXYGEN),\ CustomTarget_doxygen \ GeneratedPackage_odk_doxygen \ @@ -34,6 +33,7 @@ $(eval $(call gb_Module_add_targets,odk,\ ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,odk,\ + $(if $(filter-out ARM64,$(CPUNAME)),Package_cli) \ CustomTarget_config_win \ Package_config_win \ )) 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 \ )) |