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 /bridges | |
| parent | WIN always check jdk_home path and content (diff) | |
| download | core-5e1b3e924ab3d8da3718c2a3bbd0ef812595684a.tar.gz core-5e1b3e924ab3d8da3718c2a3bbd0ef812595684a.zip | |
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 'bridges')
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index a29f6b56f620..4981a81bee42 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -21,13 +21,6 @@ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \ EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist endif -else ifeq ($(CPUNAME),ARM64) - -bridges_SELECTED_BRIDGE := msvc_win32_arm64 -bridge_exception_objects := cpp2uno uno2cpp abi -bridge_noopt_objects := except -bridge_asm_objects := callvirtualfunction vtableslotcall - else ifeq ($(CPUNAME),AARCH64) ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX MACOSX NETBSD OPENBSD,$(OS)),) @@ -46,6 +39,12 @@ bridges_SELECTED_BRIDGE := gcc3_ios bridge_noopt_objects := cpp2uno except uno2cpp bridge_asm_objects := ios64_helper +else ifeq ($(COM),MSC) +bridges_SELECTED_BRIDGE := msvc_win32_arm64 +bridge_exception_objects := cpp2uno uno2cpp abi +bridge_noopt_objects := except +bridge_asm_objects := callvirtualfunction vtableslotcall + endif else ifeq ($(CPUNAME),AXP) |