commit a043b08ddc6ff65ebe8c379b1205f32c1b972529
author Andrew Hsieh <andrewhsieh@google.com> Tue Jun 17 20:39:27 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 17 05:00:50 2014 +0000
tree 251158f8ea86bd8cbe367c4a250f8cfb4170ce67
parent 9861d86239acc90f48364607f6f0decee897b0ad
parent 68350211f1894b4a544f50b3acc141c675e63fe4

Merge "Fix windows sdk build."

clang-host-build.mk

diff --git a/clang-host-build.mk b/clang-host-build.mk
index e116c02..2b42b39 100644
--- a/clang-host-build.mk
+++ b/clang-host-build.mk
@@ -17,7 +17,9 @@
 LLVM_ROOT_PATH := external/llvm
 include $(LLVM_ROOT_PATH)/llvm.mk
 
+ifneq ($(HOST_OS),windows)
 include external/libcxx/libcxx.mk
+endif
 
 ifneq ($(LLVM_HOST_BUILD_MK),)
 include $(LLVM_HOST_BUILD_MK)

host_shared_clang.mk

diff --git a/host_shared_clang.mk b/host_shared_clang.mk
index 566f3ab..8e7a2cd 100644
--- a/host_shared_clang.mk
+++ b/host_shared_clang.mk
@@ -26,11 +26,12 @@
 	libclangRewriteCore \
 	libclangSerialization
 
-LOCAL_SHARED_LIBRARIES := libLLVM libc++
 
 ifeq ($(HOST_OS),windows)
+  LOCAL_SHARED_LIBRARIES := libLLVM
   LOCAL_LDLIBS := -limagehlp -lpsapi
 else
+  LOCAL_SHARED_LIBRARIES := libLLVM libc++
   LOCAL_LDLIBS := -ldl -lpthread
 endif