From c156bc696311928af01132d159b9e307436779bb Mon Sep 17 00:00:00 2001
From: Shih-wei Liao <sliao@google.com>
Date: Mon, 7 Jun 2010 22:05:52 -0700
Subject: Fix llvm.mk and the other 49 mk files

Change-Id: I5aa02363c1083297d163a575f5a35c495f950230
---
 llvm-device-build.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index 061384a..d5766db 100644
--- a/llvm-device-build.mk
+++ b/llvm-device-build.mk
@@ -1,3 +1,6 @@
+# Only use this on the device or emulator.
+ifneq ($(TARGET_ARCH),arm)
+
 LOCAL_CFLAGS :=	\
 	-D_GNU_SOURCE	\
 	-D__STDC_LIMIT_MACROS	\
@@ -21,7 +24,7 @@ endif
 ifneq ($(REQUIRES_EH),1)
 LOCAL_CFLAGS +=	-fno-exceptions
 else
-# No action. The device target should not have exception enabled since bionic 
+# No action. The device target should not have exception enabled since bionic
 # doesn't support it
 REQUIRES_EH := 0
 endif
@@ -35,7 +38,7 @@ endif
 LOCAL_CPPFLAGS :=	\
 	$(LOCAL_CPPFLAGS)	\
 	-Woverloaded-virtual
-	
+
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=	\
 	bionic	\
@@ -59,3 +62,5 @@ $(hide) $(TBLGEN) \
     -gen-$(strip $(1)) \
     -o $@ $<
 endef
+
+endif
-- 
cgit v1.1