summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2019-01-29 18:32:54 +0100
committerJan Holesovsky <kendy@collabora.com>2019-10-22 14:09:19 +0200
commit93c82f48fc0d572f3dd818cb448283cdfb20fe5a (patch)
tree29d5d14050c05c7c4e29ac8aed3a0d380bf52f33 /external
parentc252189e3a17e128de99b7721c12e2ecf28271fe (diff)
Disable NSS GTESTS also for Windows
Following https://cgit.freedesktop.org/libreoffice/core/commit/?id=02623af4f5e0049ec5988df8ff6c7ff0f32f3fb1 See details here: http://document-foundation-mail-archive.969070.n3.nabble.com/fatal-error-LNK1561-on-nss-Visual-Studio-2017-td4256601.html Change-Id: I75f2c8a5409e484a8a5a12a6f12d5c20b244d2b2 Reviewed-on: https://gerrit.libreoffice.org/67092 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/81222 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'external')
-rw-r--r--external/nss/ExternalProject_nss.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index ef807d503e58..211fa1d64437 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -25,6 +25,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta
XCFLAGS="-arch:SSE $(SOLARINC)" \
$(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
+ NSS_DISABLE_GTESTS=1 \
,nss)
else # OS!=WNT