summaryrefslogtreecommitdiff
path: root/Repository.mk
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2023-04-05 12:58:26 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2023-04-11 12:06:25 +0200
commitd04f1cf9373e4fa7dd6d3db660393894916e41a8 (patch)
treec4e22a1b7683622d4d08a2e5c2ba1878170d38de /Repository.mk
parent8029a239cf294d06bb9f29aeb9b6897cb422a880 (diff)
allow native compile for windows aarch64
using both --host=aarch64-pc-cygwin and --build=aarch64-pc-cygwin on a suitable system. Change-Id: Id11e25b03de8dd8dd52c63e7a06d57d44e3fce33 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150053 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'Repository.mk')
-rw-r--r--Repository.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk
index f8dc574145b7..fb87ff5de068 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -88,7 +88,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
))
$(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
- $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64,$(CPUNAME)),climaker)) \
+ $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64_TRUE,$(CPUNAME)_$(CROSS_COMPILING)),climaker)) \
cppumaker \
javamaker \
$(call gb_CondExeSp2bv,sp2bv) \
@@ -592,7 +592,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
affine_uno_uno \
- $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64,$(CPUNAME)),cli_uno)) \
+ $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64_TRUE,$(CPUNAME)_$(CROSS_COMPILING)),cli_uno)) \
i18nlangtag \
$(if $(ENABLE_JAVA), \
java_uno \
@@ -903,7 +903,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)),$(if $(filter-out AARCH64,$(CPUNAME)),odk_cli)) \
+ $(if $(filter WNT,$(OS)),$(if $(filter-out AARCH64_TRUE,$(CPUNAME)_$(CROSS_COMPILING)),odk_cli)) \
odk_config \
$(if $(filter WNT,$(OS)),odk_config_win) \
odk_docs \