summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2015-01-05 18:20:31 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-05 18:20:31 +0000
commit00227471485a815abadf2cc8cd334c4e86f187f9 (patch)
tree518831236e66a4abe0e66d86e4d4ba9d7dba9a35
parent1be856302d996cbccf76d19bb651347dc2c8d04b (diff)
parentd1f3406a5cee950c0f3abfb4476f592dd0e1578f (diff)
downloadexternal_llvm-00227471485a815abadf2cc8cd334c4e86f187f9.zip
external_llvm-00227471485a815abadf2cc8cd334c4e86f187f9.tar.gz
external_llvm-00227471485a815abadf2cc8cd334c4e86f187f9.tar.bz2
Merge "Don't clobber LOCAL_CFLAGS_arm64 in llvm-device-build."
-rw-r--r--llvm-device-build.mk2
1 files changed, 1 insertions, 1 deletions
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