external/nss/ExternalProject_nss.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 5ad2aaebc49b0a0e63db93d9bf146b702e93ab30
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Sat Jul 4 23:07:52 2020 +0300
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 23 16:15:22 2020 +0100
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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106375
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/external/nss/ExternalProject_nss.mk
b/external/nss/ExternalProject_nss.mk
index d95506f0e949..bdb5d10f4318 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
MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
$(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \
$(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
