Merge branch 'test-ci'

2018-03-10 13:13:48 -08:00 · 2018-03-10 13:13:48 -08:00 · 10fb1f2730
parent 152b408934 e4fd3fd52b
commit 10fb1f2730
2 changed files with 4 additions and 0 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -709,6 +709,9 @@ target_link_libraries(zig LINK_PUBLIC
    ${LLVM_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
 )
+if(APPLE)
+    target_link_libraries(zig LINK_PUBLIC xml2)
+endif()
 if(ZIG_DIA_GUIDS_LIB)
    target_link_libraries(zig LINK_PUBLIC ${ZIG_DIA_GUIDS_LIB})
 endif()
--- a/build.zig
+++ b/build.zig
@ -68,6 +68,7 @@ pub fn build(b: &Builder) !void {

        exe.linkSystemLibrary("pthread");
    } else if (exe.target.isDarwin()) {
+        exe.linkSystemLibrary("xml2");
        exe.linkSystemLibrary("c++");
    }