Merge "Stop building against ncurses." am: 73c09671b3 am: d845b48987 am: a50e4e858c
Original change: https://android-review.googlesource.com/c/platform/external/llvm/+/1516481
Change-Id: Ibf4d68955aeaed7704156b02be95b6a8a977435f
diff --git a/Android.bp b/Android.bp
index be4d6d2..5da0d03 100644
--- a/Android.bp
+++ b/Android.bp
@@ -82,9 +82,7 @@
host_ldlibs: ["-luuid"],
},
linux_glibc: {
- // Add on ncurses to have support for terminfo
host_ldlibs: [
- "-lncurses",
"-lgcc_s",
],
},
@@ -93,11 +91,6 @@
"-Wno-deprecated-declarations",
"-Woverloaded-virtual",
],
-
- // Add on ncurses to have support for terminfo
- host_ldlibs: [
- "-lncurses",
- ],
},
},
}
diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h
index 9563335..eb6c81d 100644
--- a/host/include/llvm/Config/config.h
+++ b/host/include/llvm/Config/config.h
@@ -489,9 +489,7 @@
#define HAVE_SYS_WAIT_H 1
/* Define if the setupterm() function is supported this platform. */
-#ifndef __BIONIC__
-#define HAVE_TERMINFO 1
-#endif
+/* #undef HAVE_TERMINFO */
/* 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 89074a8..956dad4 100644
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -55,9 +55,6 @@
$(LLVM_ROOT_PATH)/host/include \
$(LOCAL_C_INCLUDES)
-# Add on ncurses to have support for terminfo
-LOCAL_LDLIBS_darwin += -lncurses
-LOCAL_LDLIBS_linux += -lncurses
LOCAL_LDLIBS_linux += -lgcc_s
LOCAL_LDLIBS_windows += -luuid
