summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2022-03-31 20:33:02 +0200
committerAndras Timar <andras.timar@collabora.com>2022-04-02 11:56:06 +0200
commitfdc0646512c920acb69a03b44d0f59e965e208f9 (patch)
treea06643a84a387de2c7643ba84f2fee66770b1a11
parent210add29399c1a1270557eff4466908f406819d7 (diff)
nss: build with zlib module on WNTco-21.06.24-1
Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r--configure.ac6
-rw-r--r--external/nss/ExternalProject_nss.mk3
2 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 802d6c0b3fa5..aa9206171e06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8907,7 +8907,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 a9c4fcadfc95..8a43505a0819 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 ARM64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \
- XCFLAGS="$(SOLARINC)" \
+ XCFLAGS="$(SOLARINC) $(ZLIB_CFLAGS)" \
$(if $(CROSS_COMPILING),\
CROSS_COMPILE=1 \
$(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \