external/nss/ExternalProject_nss.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 429f5c788a73d69c4286f08ea3757869e1fa3da8
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Sat Jul 4 22:37:09 2020 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Sun Jul 5 09:09:51 2020 +0200
Be more generic for CPUNAME=ARM64
It's used not just for iOS but can be macOS too.
Also, nss wants to call it CPU_ARCH=aarch64.
Change-Id: I6398c3bf1409f2ccf16b0d154ad7c2b56f493b15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97986
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/external/nss/ExternalProject_nss.mk
b/external/nss/ExternalProject_nss.mk
index c3cb301e8afb..d3c09eb47a45 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -42,14 +42,14 @@ $(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 iOS,$(OS)),USE_64=1) \
+ $(if $(filter ARM64,$(CPUNAME)),USE_64=1) \
$(if $(filter MACOSX,$(OS)),\
MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
NSS_USE_SYSTEM_SQLITE=1) \
$(if $(filter LINUX,$(OS)),$(if
$(ENABLE_DBGUTIL),,BUILD_OPT=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(CROSS_COMPILING),\
- $(if $(filter
iOS-ARM64,$(OS)-$(CPUNAME)),CPU_ARCH=arm64) \
+ $(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \
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
