Fix zlib <-> libz confusion within build system

JuliaLang · Oct 7, 2019 · 7f1e190 · 7f1e190
1 parent 0aa59a0
commit 7f1e190
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -170,6 +170,11 @@ JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSSH2) += libssh2
 JL_PRIVATE_LIBS-$(USE_SYSTEM_MBEDTLS) += libmbedtls libmbedcrypto libmbedx509
 JL_PRIVATE_LIBS-$(USE_SYSTEM_CURL) += libcurl
 JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBGIT2) += libgit2
+ifeq ($(OS),WINNT)
+JL_PRIVATE_LIBS-$(USE_SYSTEM_ZLIB) += zlib
+else
+JL_PRIVATE_LIBS-$(USE_SYSTEM_ZLIB) += libz
+endif
 ifeq ($(USE_LLVM_SHLIB),1)
 JL_PRIVATE_LIBS-$(USE_SYSTEM_LLVM) += libLLVM libLLVM-6
 endif

diff --git a/deps/Makefile b/deps/Makefile
@@ -139,8 +139,8 @@ ifeq ($(USE_SYSTEM_UTF8PROC), 0)
 DEP_LIBS += utf8proc
 endif
 
-ifeq ($(USE_SYSTEM_LIBZ), 0)
-DEP_LIBS += libz
+ifeq ($(USE_SYSTEM_ZLIB), 0)
+DEP_LIBS += zlib
 endif
 
 ifeq ($(USE_SYSTEM_P7ZIP), 0)