configure.ac | 6 +++++- external/nss/ExternalProject_nss.mk | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-)
New commits: commit 7f809719c0fc7a5aec2b34d563e224f8790375ef Author: Michael Stahl <[email protected]> AuthorDate: Thu Mar 31 20:33:02 2022 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Apr 1 15:59:06 2022 +0200 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 <[email protected]> (cherry picked from commit 1c748fefc3c5b42e3548a1a7f5017a579982005a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132376 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/configure.ac b/configure.ac index 7d9603a47783..a8802eb6eb78 100644 --- a/configure.ac +++ b/configure.ac @@ -8994,7 +8994,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 81e5dfb45d3e..5514f2dbb293 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)" \ $(if $(CROSS_COMPILING),\ CROSS_COMPILE=1 \ $(if $(filter AARCH64,$(CPUNAME)),CPU_ARCH=aarch64) \
