external/nss/ExternalProject_nss.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit f019f4aa6e3e69899d7b7c06b66aa4077c60c4c5 Author: Tor Lillqvist <t...@iki.fi> AuthorDate: Sat Jul 4 22:34:52 2020 +0300 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Sun Jul 5 09:09:12 2020 +0200 We don't actually build nss for iOS, but if we did, it would be for arm64 iOS is 64-bit only since long. Change-Id: Ic0d9f69764951f420be10947c5b8889a3f95962c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97985 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 4bb51aa7c402..c3cb301e8afb 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)),$(if $(filter ARM64,$(CPUNAME)),USE_64=1)) \ + $(if $(filter iOS,$(OS)),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-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \ + $(if $(filter iOS-ARM64,$(OS)-$(CPUNAME)),CPU_ARCH=arm64) \ 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