Merge "Update aosp/master llvm for rebase to r233350"

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

diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index 7464c98..823209d 100644 (file)
--- a/llvm-device-build.mk
+++ b/llvm-device-build.mk
@@ -52,12 +52,12 @@ endif
 LOCAL_CPPFLAGS :=      \
        $(LOCAL_CPPFLAGS)       \
        -Woverloaded-virtual    \
-       -Wno-sign-promo
+       -Wno-sign-promo         \
+       -std=c++11
 
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=    \
        bionic \
-       external/stlport/stlport \
        $(LLVM_ROOT_PATH)       \
        $(LLVM_ROOT_PATH)/include       \
        $(LLVM_ROOT_PATH)/device/include        \
@@ -69,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     \