am 2ce42da6: Merge "Give lit a --xunit-xml-output option for saving results in xunit...

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

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 0ac97c3..a3c9539 100644 (file)
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -1,9 +1,8 @@
 # Windows can't use Clang to build yet
 ifneq ($(HOST_OS),windows)
 LOCAL_CLANG := true
-endif
-
 include external/libcxx/libcxx.mk
+endif
 
 LOCAL_CFLAGS +=        \
        -D_GNU_SOURCE   \
@@ -48,15 +47,17 @@ LOCAL_C_INCLUDES := \
        $(LLVM_ROOT_PATH)       \
        $(LLVM_ROOT_PATH)/include       \
        $(LLVM_ROOT_PATH)/host/include  \
-        external/libcxx/include \
        $(LOCAL_C_INCLUDES)
 
-LOCAL_IS_HOST_MODULE := true
-
-LOCAL_32_BIT_ONLY := true
+# 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
 
-# remove when we can use PIE binaries in all places again
-LOCAL_NO_FPIE := true
+LOCAL_IS_HOST_MODULE := true
 
 ###########################################################
 ## Commands for running tblgen to compile a td file