[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/ExternalProject_nss.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 79d874490eb3b72dff62c35bc7258e351f650005
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Sat Jul 4 22:37:09 2020 +0300
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 23 16:15:00 2020 +0100

    Be more generic for CPUNAME=ARM64
    
    It's used not just for iOS but can be macOS too.
    
    Also, nss wants to call it CPU_ARCH=aarch64.
    
    Change-Id: I6398c3bf1409f2ccf16b0d154ad7c2b56f493b15
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97986
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106374
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index b4c4f37cf07c..d95506f0e949 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -42,7 +42,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 iOS,$(OS)),$(if $(filter ARM64,$(CPUNAME)),USE_64=1)) \
+		$(if $(filter ARM64,$(CPUNAME)),USE_64=1) \
 		$(if $(filter MACOSX,$(OS)),\
 			$(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \
 			NSS_USE_SYSTEM_SQLITE=1) \
@@ -51,6 +51,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta
 		$(if $(CROSS_COMPILING),\
 			$(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
 			$(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \
+			$(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \
 			NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \
 		NSDISTMODE=copy \
 		$(MAKE) AR="$(AR)" \