am 7b4cd9c6: Merge "Fix mips vs. mips64 build issues."

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

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 4e2898d..d2c7e52 100644 (file)
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -3,8 +3,6 @@ ifneq ($(HOST_OS),windows)
 LOCAL_CLANG := true
 endif
 
-include external/libcxx/libcxx.mk
-
 LOCAL_CFLAGS +=        \
        -D_GNU_SOURCE   \
        -D__STDC_LIMIT_MACROS   \
@@ -48,12 +46,23 @@ LOCAL_C_INCLUDES := \
        $(LLVM_ROOT_PATH)       \
        $(LLVM_ROOT_PATH)/include       \
        $(LLVM_ROOT_PATH)/host/include  \
-        external/libcxx/include \
        $(LOCAL_C_INCLUDES)
 
+# Add on ncurses to have support for terminfo
+ifneq ($(HOST_OS),windows)
+LOCAL_LDLIBS += -lncurses
+ifneq ($(HOST_OS),darwin)
+LOCAL_LDLIBS += -lgcc_s
+endif
+endif
+
 LOCAL_IS_HOST_MODULE := true
 
-LOCAL_32_BIT_ONLY := true
+ifeq ($(HOST_PREFER_32_BIT),true)
+LOCAL_MULTILIB := 32
+else
+LOCAL_MULTILIB := first
+endif
 
 ###########################################################
 ## Commands for running tblgen to compile a td file