aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-11-04 00:53:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-04 00:53:30 +0000
commit0a12e3b13373e65953a2bb1074532bd981c31a6a (patch)
tree1ad7ad3e3f3b03f9757db8d77e20cb5a839793b8
parent4de5ad4388bab02661c00437e7cf6b463b705ca9 (diff)
parent3160f5018b58edd927dc288630f115b8f910f8f3 (diff)
downloadexternal_llvm-0a12e3b13373e65953a2bb1074532bd981c31a6a.zip
external_llvm-0a12e3b13373e65953a2bb1074532bd981c31a6a.tar.gz
external_llvm-0a12e3b13373e65953a2bb1074532bd981c31a6a.tar.bz2
am 3160f501: Merge "Add color support for Clang!"
* commit '3160f5018b58edd927dc288630f115b8f910f8f3': Add color support for Clang!
-rw-r--r--host/include/llvm/Config/config.h3
-rw-r--r--llvm-host-build.mk5
2 files changed, 8 insertions, 0 deletions
diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h
index 42115e4..8135848 100644
--- a/host/include/llvm/Config/config.h
+++ b/host/include/llvm/Config/config.h
@@ -472,6 +472,9 @@
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
#define HAVE_SYS_WAIT_H 1
+/* Define if the setupterm() function is supported this platform. */
+#define HAVE_TERMINFO 1
+
/* Define to 1 if you have the <termios.h> header file. */
#define HAVE_TERMIOS_H 1
diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index b40bcbe..8e5bcc0 100644
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -49,6 +49,11 @@ LOCAL_C_INCLUDES := \
$(LLVM_ROOT_PATH)/host/include \
$(LOCAL_C_INCLUDES)
+# Add on ncurses to have support for terminfo
+ifneq ($(HOST_OS),windows)
+LOCAL_LDLIBS += -lncurses
+endif
+
LOCAL_IS_HOST_MODULE := true
LOCAL_32_BIT_ONLY := true