Merge branch 'master' of https://github.com/zig-lang/zig

3 files changed, 5 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f634f17ac..8c74a71a8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -709,7 +709,7 @@ target_link_libraries(zig LINK_PUBLIC
     ${LLVM_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
 )
-if(APPLE)
+if(NOT MSVC)
     target_link_libraries(zig LINK_PUBLIC xml2)
 endif()
 if(ZIG_DIA_GUIDS_LIB)
diff --git a/README.md b/README.md
index e58b6d564b..acc7e891e7 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,7 @@ libc. Create demo games using Zig.
  * cmake >= 2.8.5
  * gcc >= 5.0.0 or clang >= 3.6.0
  * LLVM, Clang, LLD development libraries == 6.x, compiled with the same gcc or clang version above
+   - These depend on zlib and libxml2.
 
 ##### Windows
 
diff --git a/build.zig b/build.zig
index d7c67d8a78..2e6c6dd831 100644
--- a/build.zig
+++ b/build.zig
@@ -68,7 +68,6 @@ pub fn build(b: &Builder) !void {
 
         exe.linkSystemLibrary("pthread");
     } else if (exe.target.isDarwin()) {
-        exe.linkSystemLibrary("xml2");
         exe.linkSystemLibrary("c++");
     }
 
@@ -76,6 +75,9 @@ pub fn build(b: &Builder) !void {
         exe.addObjectFile(dia_guids_lib);
     }
 
+    if (exe.target.getOs() != builtin.Os.windows) {
+        exe.linkSystemLibrary("xml2");
+    }
     exe.linkSystemLibrary("c");
 
     b.default_step.dependOn(&exe.step);