| ... | ... | @@ -67,6 +67,14 @@ if(NOT MSVC) |
| 67 | 67 | else() |
| 68 | 68 | message("${ZLIB} found") |
| 69 | 69 | endif() |
| 70 | |
| 71 | if(APPLE AND ZIG_STATIC) |
| 72 | list(REMOVE_ITEM LLVM_LIBRARIES "-lz") |
| 73 | list(REMOVE_ITEM LLVM_LIBRARIES "-lxml2") |
| 74 | list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses") |
| 75 | find_library(LIBNCURSES NAMES libncurses.a) |
| 76 | list(APPEND LLVM_LIBRARIES "${LIBNCURSES}" "${LIBXML2}" "${ZLIB}") |
| 77 | endif() |
| 70 | 78 | endif() |
| 71 | 79 | |
| 72 | 80 | set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp") |
| ... | ... | @@ -815,7 +823,11 @@ if(MINGW) |
| 815 | 823 | elseif(MSVC) |
| 816 | 824 | set(EXE_LDFLAGS "/STACK:16777216") |
| 817 | 825 | elseif(ZIG_STATIC) |
| 818 | | set(EXE_LDFLAGS "-static") |
| 826 | if(APPLE) |
| 827 | set(EXE_LDFLAGS " ") |
| 828 | else() |
| 829 | set(EXE_LDFLAGS "-static") |
| 830 | endif() |
| 819 | 831 | else() |
| 820 | 832 | set(EXE_LDFLAGS " ") |
| 821 | 833 | endif() |
Andrew Kelley <andrew@ziglang.org> 2018-09-27 15:07:51-04:00