From 36b56886974eae4f9c5ebc96befd3e7bfe5de338 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Wed, 23 Apr 2014 16:57:46 -0700
Subject: Update to LLVM 3.5a.

Change-Id: Ifadecab779f128e62e430c2b4f6ddd84953ed617
---
 llvm-host-build.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'llvm-host-build.mk')

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index afe6b4c..4ab911b 100644
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -1,4 +1,8 @@
-LOCAL_CFLAGS :=	\
+LOCAL_CLANG := true
+
+include external/libcxx/libcxx.mk
+
+LOCAL_CFLAGS +=	\
 	-D_GNU_SOURCE	\
 	-D__STDC_LIMIT_MACROS	\
 	-O2	\
@@ -7,6 +11,7 @@ LOCAL_CFLAGS :=	\
 	-W	\
 	-Wno-unused-parameter	\
 	-Wwrite-strings	\
+        -Dsprintf=sprintf \
 	$(LOCAL_CFLAGS)
 
 ifeq ($(LLVM_ENABLE_ASSERTION),true)
@@ -32,13 +37,15 @@ 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 :=	\
 	$(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