[Libreoffice-commits] core.git: external/nss
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Tue Oct 20 05:32:22 UTC 2020
external/nss/ExternalProject_nss.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit db6457fc6035a9c271edbaedd33d04985d1235b2
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Oct 19 20:52:46 2020 +0100
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 20 07:31:35 2020 +0200
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>
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 062f6642f6f6..b9f56d24de0c 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -57,7 +57,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 \
More information about the Libreoffice-commits
mailing list