diff options
| -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 3bd8a43eb690..6e169111616e 100644 --- a/configure.ac +++ b/configure.ac @@ -7763,7 +7763,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 68019eed1e08..afe4e3adea22 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -22,9 +22,10 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ $(call gb_ExternalProject_run,build,\ $(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \ 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 \ |