am f2bd4beb: Merge "Add support for building libLTO.so in LLVM."

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

diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index 107762a..172ecf1 100644 (file)
--- a/llvm-device-build.mk
+++ b/llvm-device-build.mk
@@ -28,7 +28,7 @@ LOCAL_CFLAGS := -DANDROID_ENGINEERING_BUILD \
                 $(LOCAL_CFLAGS)
 endif
 
-ifeq ($(LLVM_ENABLE_ASSERTION),true)
+ifeq ($(FORCE_BUILD_LLVM_DISABLE_NDEBUG),true)
 LOCAL_CFLAGS :=        \
        $(LOCAL_CFLAGS) \
        -D_DEBUG        \
@@ -58,7 +58,6 @@ LOCAL_CPPFLAGS :=     \
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=    \
        bionic \
-       external/libcxx/include \
        $(LLVM_ROOT_PATH)       \
        $(LLVM_ROOT_PATH)/include       \
        $(LLVM_ROOT_PATH)/device/include        \
@@ -70,7 +69,7 @@ LOCAL_C_INCLUDES :=   \
 define transform-device-td-to-out
 @mkdir -p $(dir $@)
 @echo "Device TableGen (gen-$(1)): $(TBLGEN_LOCAL_MODULE) <= $<"
-$(hide) $(TBLGEN) \
+$(hide) $(LLVM_TBLGEN) \
        -I $(dir $<)    \
        -I $(LLVM_ROOT_PATH)/include    \
        -I $(LLVM_ROOT_PATH)/device/include     \