From 1c748fefc3c5b42e3548a1a7f5017a579982005a Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 31 Mar 2022 20:33:02 +0200 Subject: nss: build with zlib module on WNT Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367 Tested-by: Jenkins Reviewed-by: Michael Stahl --- external/nss/ExternalProject_nss.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'external') diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index b9f953f3649b..d9f19c0d5e09 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -27,10 +27,11 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ MOZ_DEBUG_FLAGS=" " \ OPT_CODE_SIZE=0) \ OS_TARGET=WIN95 \ + USE_SYSTEM_ZLIB=1 \ $(if $(filter X86_64,$(CPUNAME)),USE_64=1) \ $(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \ LIB="$(ILIB)" \ - XCFLAGS="$(SOLARINC)" \ + XCFLAGS="$(SOLARINC) $(ZLIB_CFLAGS)" \ NSPR_CONFIGURE_OPTS="$(gb_CONFIGURE_PLATFORMS)" \ $(if $(CROSS_COMPILING),\ CROSS_COMPILE=1 \ -- cgit