diff options
| author | Elliott Hughes <enh@google.com> | 2020-12-04 01:23:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-04 01:23:13 +0000 |
| commit | 2e3decc9feef5ae1a62729551653b9b8f7e2ab09 (patch) | |
| tree | b76121fd0e2aa01038a952676d6336160fce9904 | |
| parent | 2e6d319493752c8b40ad9811b7df77562c772b34 (diff) | |
| parent | a50e4e858caa5525e329dbcddd9cffcb5f71782f (diff) | |
| download | llvm-2e3decc9feef5ae1a62729551653b9b8f7e2ab09.tar.gz | |
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
| -rw-r--r-- | Android.bp | 7 | ||||
| -rw-r--r-- | host/include/llvm/Config/config.h | 4 | ||||
| -rw-r--r-- | llvm-host-build.mk | 3 |
3 files changed, 1 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp index be4d6d20da1c..5da0d03466e6 100644 --- a/Android.bp +++ b/Android.bp @@ -82,9 +82,7 @@ llvm_defaults { host_ldlibs: ["-luuid"], }, linux_glibc: { - // Add on ncurses to have support for terminfo host_ldlibs: [ - "-lncurses", "-lgcc_s", ], }, @@ -93,11 +91,6 @@ llvm_defaults { "-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 9563335abbd7..eb6c81d1ec1d 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 89074a8d7760..956dad47dbec 100644 --- a/llvm-host-build.mk +++ b/llvm-host-build.mk @@ -55,9 +55,6 @@ LOCAL_C_INCLUDES := \ $(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 |