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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 6903605f49a3a3c3a63770dc9a7eb135c9fbbd09
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Mon Nov 23 02:27:18 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 23 16:16:15 2020 +0100

    Clean up arm64 confusion a bit
    
    Set nss's CPU_ARCH to aarch64 also when compiling to arm64 on arm64,
    without any cross-compiling involved.
    
    Change-Id: I2eb9fb7b9547e5ded75ca242ea7ef09c826bf561
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106377
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index bdb5d10f4318..38b1a615808b 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 ARM64,$(CPUNAME)),USE_64=1) \
+		$(if $(filter AARCH64 ARM64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \
 		$(if $(filter MACOSX,$(OS)),\
 			$(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \
 			NSS_USE_SYSTEM_SQLITE=1) \
@@ -52,7 +52,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta
 			CROSS_COMPILE=1 \
 			$(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)" \