From 8a95734f9813e11664344a198af8c9203451e684 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Mon, 29 Sep 2014 22:54:01 -0700 Subject: Fix windows build for LLVM. Don't include libcxx on windows. Fix PSTR -> PCSTR typo in config header. Bug: 14416410 Change-Id: I2e66ed56a5a585ab126b9ac181def057908289d0 --- include/llvm/Config/llvm-platform-config.h | 2 +- llvm-host-build.mk | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/llvm/Config/llvm-platform-config.h b/include/llvm/Config/llvm-platform-config.h index cd005be..c9e82da 100644 --- a/include/llvm/Config/llvm-platform-config.h +++ b/include/llvm/Config/llvm-platform-config.h @@ -141,7 +141,7 @@ #define HAVE_LIBIMAGEHLP 1 /* Type of 1st arg on ELM Callback */ -#define WIN32_ELMCB_PCSTR PSTR +#define WIN32_ELMCB_PCSTR PCSTR #else /* Linux, Mac OS X, ... Unixish platform */ diff --git a/llvm-host-build.mk b/llvm-host-build.mk index 4e2898d..b40bcbe 100644 --- a/llvm-host-build.mk +++ b/llvm-host-build.mk @@ -1,9 +1,8 @@ # Windows can't use Clang to build yet ifneq ($(HOST_OS),windows) LOCAL_CLANG := true -endif - include external/libcxx/libcxx.mk +endif LOCAL_CFLAGS += \ -D_GNU_SOURCE \ @@ -48,7 +47,6 @@ LOCAL_C_INCLUDES := \ $(LLVM_ROOT_PATH) \ $(LLVM_ROOT_PATH)/include \ $(LLVM_ROOT_PATH)/host/include \ - external/libcxx/include \ $(LOCAL_C_INCLUDES) LOCAL_IS_HOST_MODULE := true -- cgit v1.1