authorgravatar for emekankurumeh@outlook.comemekoi <emekankurumeh@outlook.com> 2019-03-09 17:54:34-06:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-13 10:37:53-04:00
log1ed38a682ec6cabcd72472b6988b27b10714216a
treec67bf04d46090636e0551b940804d03f2b6ae88e
parent26b0d34361912a4b521d7202310647909cf7cb44

added z3 and fixed dynamic linker on mingw

2 files changed, 11 insertions(+), 15 deletions(-)

CMakeLists.txt+10
......@@ -50,6 +50,10 @@ option(ZIG_FORCE_EXTERNAL_LLD "If your system has the LLD patches use it instead
5050find_package(llvm)
5151find_package(clang)
5252
53if(MINGW)
54 find_package(z3)
55endif()
56
5357if(APPLE AND ZIG_STATIC)
5458 list(REMOVE_ITEM LLVM_LIBRARIES "-lz")
5559 list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses")
......@@ -6716,9 +6720,15 @@ target_link_libraries(zig LINK_PUBLIC
67166720 ${LLVM_LIBRARIES}
67176721 ${CMAKE_THREAD_LIBS_INIT}
67186722)
6723
67196724if(NOT MSVC)
67206725 target_link_libraries(zig LINK_PUBLIC ${LIBXML2})
67216726endif()
6727
6728if(MINGW)
6729 target_link_libraries(zig LINK_PUBLIC ${Z3_LIBRARIES})
6730endif()
6731
67226732if(ZIG_DIA_GUIDS_LIB)
67236733 target_link_libraries(zig LINK_PUBLIC ${ZIG_DIA_GUIDS_LIB})
67246734endif()
src/target.cpp+1-15
......@@ -1093,22 +1093,8 @@ const char *target_dynamic_linker(const ZigTarget *target) {
10931093 case OsWatchOS:
10941094 case OsMacOSX:
10951095 case OsUefi:
1096 return nullptr;
1097
10981096 case OsWindows:
1099 switch (target->abi) {
1100 case ZigLLVM_GNU:
1101 case ZigLLVM_GNUABIN32:
1102 case ZigLLVM_GNUABI64:
1103 case ZigLLVM_GNUEABI:
1104 case ZigLLVM_GNUEABIHF:
1105 case ZigLLVM_GNUX32:
1106 case ZigLLVM_Cygnus:
1107 zig_panic("TODO implement target_dynamic_linker for mingw/cygwin");
1108 default:
1109 return nullptr;
1110 }
1111 zig_unreachable();
1097 return nullptr;
11121098
11131099 case OsAnanas:
11141100 case OsCloudABI: