From d1f3406a5cee950c0f3abfb4476f592dd0e1578f Mon Sep 17 00:00:00 2001
From: Tim Murray <timmurray@google.com>
Date: Mon, 5 Jan 2015 10:09:39 -0800
Subject: Don't clobber LOCAL_CFLAGS_arm64 in llvm-device-build.

bug 18808781

Change-Id: Iabd483a8ec91a4bb6a21e4569c53f28271abdd22
---
 llvm-device-build.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index acdb0a8..a0691e7 100644
--- a/llvm-device-build.mk
+++ b/llvm-device-build.mk
@@ -18,7 +18,7 @@ LOCAL_CFLAGS :=	\
 
 # ARM64 builds seem to miscompile libLLVM without fno-inline.
 # Test and eventually remove after a future rebase.
-LOCAL_CFLAGS_arm64 := -fno-inline
+LOCAL_CFLAGS_arm64 += -fno-inline
 
 # The three inline options together reduce libbcc.so almost 1MB.
 # We move them from global build/core/combo/TARGET_linux-arm.mk
-- 
cgit v1.1