From 7abe37e4aee38cc79d91dd069a37d7e91d5bef53 Mon Sep 17 00:00:00 2001
From: Shih-wei Liao <sliao@google.com>
Date: Wed, 28 Apr 2010 01:47:00 -0700
Subject: Sync upstream to r102410. Re-turn on sdk.

Change-Id: I91a890863989a67243b4d2dfd1ae09b843ebaeaf
---
 llvm-host-build.mk | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 263afe7..1424dfe 100644
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -5,7 +5,6 @@ LOCAL_CFLAGS :=	\
 	-D__STDC_CONSTANT_MACROS	\
 	-O2	\
 	-fomit-frame-pointer	\
-	-Woverloaded-virtual	\
 	-Wall	\
 	-W	\
 	-Wno-unused-parameter	\
@@ -13,18 +12,23 @@ LOCAL_CFLAGS :=	\
 	$(LOCAL_CFLAGS)
 
 ifneq ($(REQUIRES_EH),1)
-LOCAL_CFLAGS +=	-fno-exceptions
+LOCAL_CFLAGS += -fno-exceptions
 else
 REQUIRES_EH := 0
 LOCAL_CFLAGS += -fexceptions
 endif
 
 ifneq ($(REQUIRES_RTTI),1)
-LOCAL_CFLAGS +=	-fno-rtti
+LOCAL_CFLAGS += -fno-rtti
 else
 REQUIRES_RTTI := 0
 endif
 
+LOCAL_CPPFLAGS :=	\
+	$(LOCAL_CPPFLAGS)	\
+	$(LOCAL_CFLAGS)	\
+	-Woverloaded-virtual
+	
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=	\
 	$(LLVM_ROOT_PATH)	\
-- 
cgit v1.1