diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-03-22 22:13:39 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-03-23 23:46:12 +0100 |
| commit | 5e1b3e924ab3d8da3718c2a3bbd0ef812595684a (patch) | |
| tree | 1af73a649f62f6db48b546958979840b24e13b19 /Repository.mk | |
| parent | 2a0ff854b165883d33bbbbf1292c34858e9865d1 (diff) | |
Rename LO Windows arm64 ID to aarch64
The Windows platform is called Arm64. But now that the ID for Mac
is also going to be renamed from arm64 to aarch64, this get's rid
of the arm64 as the UNO identifier and user in gbuild, just like
on all other Arm64 platforms.
Change-Id: I60a7eafd04b426f17b6e41ad9a09e6405c0d4173
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112973
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Repository.mk b/Repository.mk index d61b3037c1f0..ab7daa3ef333 100644 --- a/Repository.mk +++ b/Repository.mk @@ -76,7 +76,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 ARM64,$(CPUNAME)),climaker)) \ + $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64,$(CPUNAME)),climaker)) \ cppumaker \ idlc \ javamaker \ @@ -149,7 +149,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ unoinfo \ unopkg \ unopkg_com \ - $(if $(filter-out ARM64,$(CPUNAME)),twain32shim) \ + $(if $(filter-out AARCH64,$(CPUNAME)),twain32shim) \ ) \ )) @@ -541,7 +541,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 ARM64,$(CPUNAME)),cli_uno)) \ + $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64,$(CPUNAME)),cli_uno)) \ i18nlangtag \ $(if $(ENABLE_JAVA), \ java_uno \ @@ -554,7 +554,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ unsafe_uno_uno \ $(if $(filter MSC,$(COM)), \ $(if $(filter INTEL,$(CPUNAME)),msci, \ - $(if $(filter ARM64,$(CPUNAME)),msca,mscx)),gcc3)_uno \ + $(if $(filter AARCH64,$(CPUNAME)),msca,mscx)),gcc3)_uno \ )) $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ @@ -833,7 +833,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 ARM64,$(CPUNAME)),odk_cli)) \ + $(if $(filter WNT,$(OS)),$(if $(filter-out AARCH64,$(CPUNAME)),odk_cli)) \ odk_config \ $(if $(filter WNT,$(OS)),odk_config_win) \ odk_docs \ |