diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2022-03-31 20:33:02 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2022-04-06 10:49:17 +0200 |
commit | 13809b9f0f2f985562553bdbd1c1f5a81fb064d8 (patch) | |
tree | 5019e4dab6794ba9faeafe6d22cf9c96ab970234 | |
parent | e306f209126ebf3ff6c97dbf15577ffb3de405af (diff) |
nss: build with zlib module on WNT
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 1c748fefc3c5b42e3548a1a7f5017a579982005a)
Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | external/nss/ExternalProject_nss.mk | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index a530bc311e67..0095852d7459 100644 --- a/configure.ac +++ b/configure.ac @@ -8275,7 +8275,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 49726ff224d4..7bcafb581479 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 \ |