commit 4041c68ea59181f1c4774c356809066d2051db41
author Michael Stahl <Michael.Stahl@cib.de> Sun Dec 20 21:20:28 2020 +0100
committer Tor Lillqvist <tml@collabora.com> Mon Dec 21 18:34:11 2020 +0100
tree 0147f8563ec6601b459b7157da9e874a4faf3a3c
parent f80dcee922428fa564b4779b1f81ad087db937ae

ios,nss: use AARCH64 consistently

Presumably missing from 1cee06c080bceab86ac894f8ae86d4d296b050aa

Change-Id: I0f658bb36179b741f6f47264ee1400633db69d6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108064
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>

external/nss/ExternalProject_nss.mk

diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index b9f56d2..19831b6 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta
	$(call gb_ExternalProject_run,build,\
		$(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \
		$(if $(filter ANDROID,$(OS)),$(if $(filter AARCH64,$(CPUNAME)),USE_64=1)) \
		$(if $(filter AARCH64 ARM64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \
		$(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \
		$(if $(filter MACOSX,$(OS)),\
			MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
			NSS_USE_SYSTEM_SQLITE=1) \

ios/CustomTarget_iOS_link.mk

diff --git a/ios/CustomTarget_iOS_link.mk b/ios/CustomTarget_iOS_link.mk
index 240f38d..ed4b7b2 100644
--- a/ios/CustomTarget_iOS_link.mk
+++ b/ios/CustomTarget_iOS_link.mk
@@ -23,7 +23,7 @@ else
IOSKIT = $(IOSGEN)/Debug_arm64/libKit.dylib
endif
else
ifeq ($(CPUNAME),ARM64)
ifeq ($(CPUNAME),AARCH64)
IOSKIT = $(IOSGEN)/Release_arm64/libKit.dylib
endif
endif