Split executeShTest into two parts so that it can be better leveraged by libc++

[android-x86/external-llvm.git] / llvm-device-build.mk

diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index 82ef055..a0691e7 100644 (file)
--- a/llvm-device-build.mk
+++ b/llvm-device-build.mk
@@ -16,6 +16,10 @@ LOCAL_CFLAGS :=      \
         -Dsprintf=sprintf \
        $(LOCAL_CFLAGS)
 
+# ARM64 builds seem to miscompile libLLVM without fno-inline.
+# Test and eventually remove after a future rebase.
+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
 # to here.
@@ -64,6 +68,8 @@ LOCAL_C_INCLUDES :=   \
        $(LLVM_ROOT_PATH)/device/include        \
        $(LOCAL_C_INCLUDES)
 
+include external/libcxx/libcxx.mk
+
 ###########################################################
 ## Commands for running tblgen to compile a td file
 ###########################################################