external/nss/ExternalProject_nss.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 2869eacfeba42549e3014b54bde50c48d7862cfd
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Sat Jul 4 23:07:52 2020 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Sun Jul 5 09:10:19 2020 +0200
Set CROSS_COMPILE=1 when cross-compiling nss
Change-Id: Iad826eb83e4c49078e6c668661446b5b70e6a981
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97987
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 d3c09eb47a45..316a1fe9c3ef 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -49,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call
gb_ExternalExecuta
$(if $(filter LINUX,$(OS)),$(if
$(ENABLE_DBGUTIL),,BUILD_OPT=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(CROSS_COMPILING),\
+ CROSS_COMPILE=1 \
$(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
