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 /odk | |
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 'odk')
-rw-r--r-- | odk/CustomTarget_check.mk | 2 | ||||
-rw-r--r-- | odk/Module_odk.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 74331955be9b..6477ad71e8c1 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -28,7 +28,7 @@ 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)),$(if $(filter-out ARM64,$(CPUNAME)),climaker)) cppumaker \ + $(foreach exe,$(if $(filter WNT,$(OS)),$(if $(filter-out AARCH64,$(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)) \ diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 693885322115..16eba69c3e3a 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -33,7 +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) \ + $(if $(filter-out AARCH64,$(CPUNAME)),Package_cli) \ CustomTarget_config_win \ Package_config_win \ )) |