File tree 1 file changed +7
-3
lines changed
1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -67,6 +67,7 @@ message("Configuring zig version ${ZIG_VERSION}")
67
67
68
68
set (ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not compatible with glibc)" )
69
69
set (ZIG_STATIC_LLVM off CACHE BOOL "Prefer linking against static LLVM libraries" )
70
+ set (ZIG_STATIC_ZLIB off CACHE BOOL "Prefer linking against static zlib" )
70
71
set (ZIG_PREFER_CLANG_CPP_DYLIB off CACHE BOOL "Try to link against -lclang-cpp" )
71
72
set (ZIG_USE_CCACHE off CACHE BOOL "Use ccache if available" )
72
73
@@ -75,7 +76,8 @@ if(CCACHE_PROGRAM AND ZIG_USE_CCACHE)
75
76
endif ()
76
77
77
78
if (ZIG_STATIC)
78
- set (ZIG_STATIC_LLVM "on" )
79
+ set (ZIG_STATIC_LLVM ON )
80
+ set (ZIG_STATIC_ZLIB ON )
79
81
endif ()
80
82
81
83
string (REGEX REPLACE "\\\\ " "\\\\\\\\ " ZIG_LIBC_LIB_DIR_ESCAPED "${ZIG_LIBC_LIB_DIR} " )
@@ -101,11 +103,13 @@ find_package(llvm)
101
103
find_package (clang)
102
104
find_package (lld)
103
105
104
- if (APPLE AND ZIG_STATIC )
106
+ if (ZIG_STATIC_ZLIB )
105
107
list (REMOVE_ITEM LLVM_LIBRARIES "-lz" )
106
- find_library (ZLIB NAMES libz.a z zlib libz)
108
+ find_library (ZLIB NAMES libz.a libzlibstatic.a z zlib libz)
107
109
list (APPEND LLVM_LIBRARIES "${ZLIB} " )
110
+ endif ()
108
111
112
+ if (APPLE AND ZIG_STATIC)
109
113
list (REMOVE_ITEM LLVM_LIBRARIES "-lcurses" )
110
114
find_library (CURSES NAMES libcurses.a curses libcurses libncurses.a ncurses libncurses)
111
115
list (APPEND LLVM_LIBRARIES "${CURSES} " )
You can’t perform that action at this time.
0 commit comments