am 69a86400: Merge "Remove the -O1 WAR for SROA.cpp compilation."

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

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 5219efd..afe6b4c 100644 (file)
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -1,7 +1,6 @@
 LOCAL_CFLAGS :=        \
        -D_GNU_SOURCE   \
        -D__STDC_LIMIT_MACROS   \
-       -D__STDC_CONSTANT_MACROS        \
        -O2     \
        -fomit-frame-pointer    \
        -Wall   \
@@ -12,9 +11,9 @@ LOCAL_CFLAGS :=       \
 
 ifeq ($(LLVM_ENABLE_ASSERTION),true)
 LOCAL_CFLAGS :=        \
+       $(LOCAL_CFLAGS) \
        -D_DEBUG        \
-       -UNDEBUG        \
-       $(LOCAL_CFLAGS)
+       -UNDEBUG
 endif
 
 ifneq ($(REQUIRES_EH),1)
@@ -49,7 +48,7 @@ LOCAL_IS_HOST_MODULE := true
 ###########################################################
 define transform-host-td-to-out
 @mkdir -p $(dir $@)
-@echo "Host TableGen: $(LOCAL_MODULE) (gen-$(1)) <= $<"
+@echo "Host TableGen: $(TBLGEN_LOCAL_MODULE) (gen-$(1)) <= $<"
 $(hide) $(TBLGEN) \
        -I $(dir $<)    \
        -I $(LLVM_ROOT_PATH)/include    \