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...@@ -50,6 +50,10 @@ option(ZIG_FORCE_EXTERNAL_LLD "If your system has the LLD patches use it instead
50find_package(llvm)50find_package(llvm)
51find_package(clang)51find_package(clang)
5252
53if(MINGW)
54 find_package(z3)
55endif()
56
53if(APPLE AND ZIG_STATIC)57if(APPLE AND ZIG_STATIC)
54 list(REMOVE_ITEM LLVM_LIBRARIES "-lz")58 list(REMOVE_ITEM LLVM_LIBRARIES "-lz")
55 list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses")59 list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses")
...@@ -6716,9 +6720,15 @@ target_link_libraries(zig LINK_PUBLIC...@@ -6716,9 +6720,15 @@ target_link_libraries(zig LINK_PUBLIC
6716 ${LLVM_LIBRARIES}6720 ${LLVM_LIBRARIES}
6717 ${CMAKE_THREAD_LIBS_INIT}6721 ${CMAKE_THREAD_LIBS_INIT}
6718)6722)
6723
6719if(NOT MSVC)6724if(NOT MSVC)
6720 target_link_libraries(zig LINK_PUBLIC ${LIBXML2})6725 target_link_libraries(zig LINK_PUBLIC ${LIBXML2})
6721endif()6726endif()
6727
6728if(MINGW)
6729 target_link_libraries(zig LINK_PUBLIC ${Z3_LIBRARIES})
6730endif()
6731
6722if(ZIG_DIA_GUIDS_LIB)6732if(ZIG_DIA_GUIDS_LIB)
6723 target_link_libraries(zig LINK_PUBLIC ${ZIG_DIA_GUIDS_LIB})6733 target_link_libraries(zig LINK_PUBLIC ${ZIG_DIA_GUIDS_LIB})
6724endif()6734endif()
src/target.cpp+1-15
...@@ -1093,22 +1093,8 @@ const char *target_dynamic_linker(const ZigTarget *target) {...@@ -1093,22 +1093,8 @@ const char *target_dynamic_linker(const ZigTarget *target) {
1093 case OsWatchOS:1093 case OsWatchOS:
1094 case OsMacOSX:1094 case OsMacOSX:
1095 case OsUefi:1095 case OsUefi:
1096 return nullptr;
1097
1098 case OsWindows:1096 case OsWindows:
1099 switch (target->abi) {1097 return nullptr;
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();
11121098
1113 case OsAnanas:1099 case OsAnanas:
1114 case OsCloudABI:1100 case OsCloudABI: