external/nss/ExternalProject_nss.mk | 3 +++ 1 file changed, 3 insertions(+)
New commits: commit 92b99bddb63b1bf4a639fc969727ac35b3ed1ac8 Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Wed Oct 14 09:09:34 2020 +0100 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Wed Oct 14 18:59:14 2020 +0200 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 <t...@collabora.com> Reviewed-by: Tor Lillqvist <t...@collabora.com> diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 25d4995ced44..062f6642f6f6 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -57,6 +57,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) \ AR="$(AR)" \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits