am 33053845: am 00227471: Merge "Don\'t clobber LOCAL_CFLAGS_arm64 in llvm-device...

* commit '3305384515fc8c4a1220cf4c0c868567ac1f1a69':
  Don't clobber LOCAL_CFLAGS_arm64 in llvm-device-build.

diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index acdb0a8..a0691e7 100644 (file)
--- 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