From 495f91fd33d492941c39424a32cf24bcfe192f35 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Wed, 19 Aug 2020 10:30:32 -0700 Subject: [PATCH] [CMake] Don't look for terminfo libs when LLVM_ENABLE_TERMINFO=OFF D85820 introduced a bug where LLVM_ENABLE_TERMINFO was set to true when the library was found, even when the user had set -DLLVM_ENABLE_TERMINFO=OFF. Patch By: haampie Differential Revision: https://reviews.llvm.org/D86173 --- compiler-rt/cmake/config-ix.cmake | 4 +++- llvm/cmake/config-ix.cmake | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index c9d0da2..1428a51 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -138,7 +138,9 @@ if(LLVM_ENABLE_TERMINFO STREQUAL FORCE_ON) else() set(MAYBE_REQUIRED) endif() -find_library(COMPILER_RT_TERMINFO_LIB NAMES terminfo tinfo curses ncurses ncursesw ${MAYBE_REQUIRED}) +if(LLVM_ENABLE_TERMINFO) + find_library(COMPILER_RT_TERMINFO_LIB NAMES terminfo tinfo curses ncurses ncursesw ${MAYBE_REQUIRED}) +endif() if(COMPILER_RT_TERMINFO_LIB) set(LLVM_ENABLE_TERMINFO 1) else() diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index 67e2eb1..6e8f476 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -152,7 +152,9 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*") else() set(MAYBE_REQUIRED) endif() - find_library(TERMINFO_LIB NAMES terminfo tinfo curses ncurses ncursesw ${MAYBE_REQUIRED}) + if(LLVM_ENABLE_TERMINFO) + find_library(TERMINFO_LIB NAMES terminfo tinfo curses ncurses ncursesw ${MAYBE_REQUIRED}) + endif() if(TERMINFO_LIB) set(LLVM_ENABLE_TERMINFO 1) else() -- 2.7.4