X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=llvm-host-build.mk;h=b40bcbea5ace77418c0313958aedc3180a3fb3a1;hb=refs%2Fheads%2Flollipop-x86;hp=e8fd0664d839e8238cf3ed26c7dca20fccbcb489;hpb=537697c3c1b073c00d2b53962004ee5116f71748;p=android-x86%2Fexternal-llvm.git

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index e8fd0664d83..b40bcbea5ac 100644
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -1,6 +1,10 @@
+# Windows can't use Clang to build yet
+ifneq ($(HOST_OS),windows)
 LOCAL_CLANG := true
+include external/libcxx/libcxx.mk
+endif
 
-LOCAL_CFLAGS :=	\
+LOCAL_CFLAGS +=	\
 	-D_GNU_SOURCE	\
 	-D__STDC_LIMIT_MACROS	\
 	-O2	\
@@ -9,7 +13,7 @@ LOCAL_CFLAGS :=	\
 	-W	\
 	-Wno-unused-parameter	\
 	-Wwrite-strings	\
-        -Dsprintf=sprintf \
+	-Dsprintf=sprintf \
 	$(LOCAL_CFLAGS)
 
 ifeq ($(LLVM_ENABLE_ASSERTION),true)
@@ -35,7 +39,8 @@ endif
 LOCAL_CPPFLAGS :=	\
 	$(LOCAL_CPPFLAGS)	\
 	-Woverloaded-virtual	\
-	-Wno-sign-promo
+	-Wno-sign-promo         \
+	-std=c++11
 
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=	\
@@ -46,13 +51,15 @@ LOCAL_C_INCLUDES :=	\
 
 LOCAL_IS_HOST_MODULE := true
 
+LOCAL_32_BIT_ONLY := true
+
 ###########################################################
 ## Commands for running tblgen to compile a td file
 ###########################################################
 define transform-host-td-to-out
 @mkdir -p $(dir $@)
 @echo "Host TableGen: $(TBLGEN_LOCAL_MODULE) (gen-$(1)) <= $<"
-$(hide) $(TBLGEN) \
+$(hide) $(LLVM_TBLGEN) \
 	-I $(dir $<)	\
 	-I $(LLVM_ROOT_PATH)/include	\
 	-I $(LLVM_ROOT_PATH)/host/include	\