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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 8f6ed6d4bd3d37bba02b540d0da917cfb4380d03
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Oct 14 09:09:34 2020 +0100
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Sun Nov 15 10:44:19 2020 +0100

    Fix build for Intel on an Apple Silicon Mac
    
    Change-Id: Id1a5906db87b05218b0810045c698e5ab2a09eca
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104271
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105884
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index f35acd59eec4..001b692a43b4 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -48,6 +48,9 @@ $(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)), \
+			CPU_ARCH=x86_64 \
+			NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \
 		NSDISTMODE=copy \
 		$(MAKE) \
 			-j1 \