[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - external/nss

[Julien Nabet (via logerrit)]

 external/nss/ExternalProject_nss.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 93c82f48fc0d572f3dd818cb448283cdfb20fe5a
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue Jan 29 18:32:54 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Oct 22 14:09:19 2019 +0200

    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 at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/81222
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

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