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 /Repository.mk | |
| 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>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 4 |
1 files changed, 2 insertions, 2 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 \ |