@@ -1496,16 +1496,19 @@ LIBGCC_NAME := libgcc_s_sjlj-1.$(SHLIB_EXT)
1496
1496
else
1497
1497
LIBGCC_NAME := libgcc_s_seh -1 . $(SHLIB_EXT )
1498
1498
endif
1499
+ LIBZ_NAME := libz . $(SHLIB_EXT )
1499
1500
endif
1500
1501
ifeq ($(OS ), Darwin )
1501
1502
ifeq ($(ARCH ), aarch64 )
1502
1503
LIBGCC_NAME := libgcc_s .2 . $(SHLIB_EXT )
1503
1504
else
1504
1505
LIBGCC_NAME := libgcc_s .1 . $(SHLIB_EXT )
1505
1506
endif
1507
+ LIBZ_NAME := libz .1 . $(SHLIB_EXT )
1506
1508
endif
1507
1509
ifneq ($(findstring $(OS ), Linux FreeBSD ), )
1508
1510
LIBGCC_NAME := libgcc_s . $(SHLIB_EXT ).1
1511
+ LIBZ_NAME := libz . $(SHLIB_EXT ).1
1509
1512
endif
1510
1513
1511
1514
# USE_SYSTEM_CSL causes it to get symlinked into build_private_shlibdir
@@ -1516,6 +1519,14 @@ LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_shlibdir)/$(L
1516
1519
endif
1517
1520
LIBGCC_INSTALL_DEPLIB := $(call dep_lib_path , $(libdir ), $(private_shlibdir )/$(LIBGCC_NAME ))
1518
1521
1522
+ # USE_SYSTEM_ZLIB causes it to get symlinked into build_private_shlibdir
1523
+ ifeq ($(USE_SYSTEM_ZLIB ), 1 )
1524
+ LIBZ := $(call dep_lib_path , $(build_libdir ), $(build_private_shlibdir )/$(LIBZ_NAME ))
1525
+ else
1526
+ LIBZ_BUILD_DEPLIB := $(call dep_lib_path , $(build_libdir ), $(build_shlibdir )/$(LIBZ_NAME ))
1527
+ endif
1528
+ LIBZ_INSTALL_DEPLIB := $(call dep_lib_path , $(libdir ), $(private_shlibdir )/$(LIBZ_NAME ))
1529
+
1519
1530
# USE_SYSTEM_LIBM and USE_SYSTEM_OPENLIBM causes it to get symlinked into build_private_shlibdir
1520
1531
ifeq ($(USE_SYSTEM_LIBM ), 1 )
1521
1532
LIBM_BUILD_DEPLIB := $(call dep_lib_path , $(build_libdir ), $(build_private_shlibdir )/$(LIBMNAME ). $(SHLIB_EXT ))
@@ -1535,10 +1546,10 @@ LIBM_INSTALL_DEPLIB := $(call dep_lib_path,$(libdir),$(private_shlibdir)/$(LIBMN
1535
1546
# * debug builds must link against libjuliadebug, not libjulia
1536
1547
# * install time relative paths are not equal to build time relative paths (../lib vs. ../lib/julia)
1537
1548
# That second point will no longer be true for most deps once they are placed within Artifacts directories.
1538
- LOADER_BUILD_DEP_LIBS = $(LIBGCC_BUILD_DEPLIB ):$(LIBM_BUILD_DEPLIB ):$(LIBJULIAINTERNAL_BUILD_DEPLIB )
1539
- LOADER_DEBUG_BUILD_DEP_LIBS = $(LIBGCC_BUILD_DEPLIB ):$(LIBM_BUILD_DEPLIB ):$(LIBJULIAINTERNAL_DEBUG_BUILD_DEPLIB )
1540
- LOADER_INSTALL_DEP_LIBS = $(LIBGCC_INSTALL_DEPLIB ):$(LIBM_INSTALL_DEPLIB ):$(LIBJULIAINTERNAL_INSTALL_DEPLIB )
1541
- LOADER_DEBUG_INSTALL_DEP_LIBS = $(LIBGCC_INSTALL_DEPLIB ):$(LIBM_INSTALL_DEPLIB ):$(LIBJULIAINTERNAL_DEBUG_INSTALL_DEPLIB )
1549
+ LOADER_BUILD_DEP_LIBS = $(LIBGCC_BUILD_DEPLIB ):$(LIBM_BUILD_DEPLIB ):$(LIBZ_BUILD_DEPLIB ):$( LIBJULIAINTERNAL_BUILD_DEPLIB )
1550
+ LOADER_DEBUG_BUILD_DEP_LIBS = $(LIBGCC_BUILD_DEPLIB ):$(LIBM_BUILD_DEPLIB ):$(LIBZ_BUILD_DEPLIB ):$( LIBJULIAINTERNAL_DEBUG_BUILD_DEPLIB )
1551
+ LOADER_INSTALL_DEP_LIBS = $(LIBGCC_INSTALL_DEPLIB ):$(LIBM_INSTALL_DEPLIB ):$(LIBZ_INSTALL_DEPLIB ):$( LIBJULIAINTERNAL_INSTALL_DEPLIB )
1552
+ LOADER_DEBUG_INSTALL_DEP_LIBS = $(LIBGCC_INSTALL_DEPLIB ):$(LIBM_INSTALL_DEPLIB ):$(LIBZ_INSTALL_DEPLIB ):$( LIBJULIAINTERNAL_DEBUG_INSTALL_DEPLIB )
1542
1553
1543
1554
# Colors for make
1544
1555
ifndef VERBOSE
0 commit comments