From 4497a28bd12888ea726a4d3bf26c6ddc04b6381b Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Fri, 18 Nov 2016 01:25:49 +0000 Subject: [PATCH] Add an option to disable libedit Summary: This should provide the function similar to `--disable-libedit` with the autotools build system, which seems to be missing from the commit (r200595) that adds this. Reviewers: pcc, beanz Subscribers: mgorny, llvm-commits Differential Revision: https://reviews.llvm.org/D26550 llvm-svn: 287293 --- llvm/CMakeLists.txt | 2 ++ llvm/cmake/config-ix.cmake | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 2e9a4a1..2f0cb41 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -357,6 +357,8 @@ set(LLVM_TARGET_ARCH "host" option(LLVM_ENABLE_TERMINFO "Use terminfo database if available." ON) +option(LLVM_ENABLE_LIBEDIT "Use libedit if available." ON) + option(LLVM_ENABLE_THREADS "Use threads if available." ON) option(LLVM_ENABLE_ZLIB "Use zlib for compression/decompression if available." ON) diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index be67c56..3e37e58 100755 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -119,8 +119,10 @@ if( NOT PURE_WINDOWS AND NOT LLVM_USE_SANITIZER MATCHES "Memory.*") set(HAVE_LIBZ 0) endif() # Skip libedit if using ASan as it contains memory leaks. - if (HAVE_HISTEDIT_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*") + if (LLVM_ENABLE_LIBEDIT AND HAVE_HISTEDIT_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*") check_library_exists(edit el_init "" HAVE_LIBEDIT) + else() + set(HAVE_LIBEDIT 0) endif() if(LLVM_ENABLE_TERMINFO) set(HAVE_TERMINFO 0) -- 2.7.4