[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - external/nss

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 2436a368460c26bc2b47742966ed152c46eedba8
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Oct 19 20:52:46 2020 +0100
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Sun Nov 15 10:45:05 2020 +0100

    Unbreak nss build for the native arm64 on an Apple Silicon Mac
    
    I had managed to break it with 92b99bddb63b1bf4a639fc969727ac35b3ed1ac8
    that made it possible to build for (Rosettafied) x86_64 on an Apple
    Silicon Mac.
    
    Change-Id: I337f2a8e777394e586f659fadd819cf7dfc0a332
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104546
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105885
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 001b692a43b4..5150a27b6a62 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
 		$(if $(CROSS_COMPILING),\
 			CROSS_COMPILE=1 \
 			NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \
-		$(if $(filter MACOSX-arm64,$(OS)-$(shell uname -m)), \
+		$(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell uname -m)), \
 			CPU_ARCH=x86_64 \
 			NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \
 		NSDISTMODE=copy \