configure.ac | 6 +++++- external/nss/ExternalProject_nss.mk | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-)
New commits: commit 88a86014d90de0e59c494fbdb354d5fe1fba55a4 Author: Michael Stahl <[email protected]> AuthorDate: Thu Mar 31 20:33:02 2022 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Fri Apr 1 14:25:23 2022 +0200 nss: build with zlib module on WNT Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 1c748fefc3c5b42e3548a1a7f5017a579982005a) Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132423 Tested-by: Michael Stahl <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/configure.ac b/configure.ac index a072505f5f44..7b09dc9b3244 100644 --- a/configure.ac +++ b/configure.ac @@ -8098,7 +8098,11 @@ else SYSTEM_ZLIB= BUILD_TYPE="$BUILD_TYPE ZLIB" ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib" - ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib" + if test "$COM" = "MSC"; then + ZLIB_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/zlib.lib" + else + ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib" + fi fi AC_SUBST(ZLIB_CFLAGS) AC_SUBST(ZLIB_LIBS) diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 41e9ad8de6fa..dfbd0dc5bc3e 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -26,9 +26,10 @@ $(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) \ LIB="$(ILIB)" \ - XCFLAGS="-arch:SSE $(SOLARINC)" \ + XCFLAGS="-arch:SSE $(SOLARINC) $(ZLIB_CFLAGS)" \ $(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \ NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \ NSS_DISABLE_GTESTS=1 \
