am 8ccad4af: Merge "Prepare for the removal of HAVE_MALLOC_H from AndroidConfig.h."

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

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index a3c9539..3093f58 100644 (file)
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -1,13 +1,18 @@
 # Windows can't use Clang to build yet
 ifneq ($(HOST_OS),windows)
 LOCAL_CLANG := true
-include external/libcxx/libcxx.mk
+endif
+
+ifeq ($(FORCE_BUILD_LLVM_DEBUG),true)
+local_optflags = -O0 -g
+else
+local_optflags = -O2
 endif
 
 LOCAL_CFLAGS +=        \
        -D_GNU_SOURCE   \
        -D__STDC_LIMIT_MACROS   \
-       -O2     \
+       $(local_optflags)       \
        -fomit-frame-pointer    \
        -Wall   \
        -W      \
@@ -16,7 +21,7 @@ LOCAL_CFLAGS +=       \
        -Dsprintf=sprintf \
        $(LOCAL_CFLAGS)
 
-ifeq ($(LLVM_ENABLE_ASSERTION),true)
+ifeq ($(FORCE_BUILD_LLVM_DISABLE_NDEBUG),true)
 LOCAL_CFLAGS :=        \
        $(LOCAL_CFLAGS) \
        -D_DEBUG        \
@@ -59,6 +64,12 @@ endif
 
 LOCAL_IS_HOST_MODULE := true
 
+ifeq ($(HOST_PREFER_32_BIT),true)
+LOCAL_MULTILIB := 32
+else
+LOCAL_MULTILIB := first
+endif
+
 ###########################################################
 ## Commands for running tblgen to compile a td file
 ###########################################################