Merge branch 'test-ci'

ziglang · Mar 10, 2018 · 10fb1f2 · 10fb1f2
2 parents 152b408 + e4fd3fd
commit 10fb1f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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()

diff --git 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++");
     }