From: Serguei Katkov Date: Wed, 18 Oct 2017 06:26:39 +0000 (+0000) Subject: Fix the incorrect detection of ICONV_LIBRARY_PATH X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb8a5a38be5e1113b3b8960da1cc39f025b6189f;p=llvm Fix the incorrect detection of ICONV_LIBRARY_PATH This is introduced in rL308711. Check for c library is incorrect here just because libc will be found always and it does not mean that iconv is presented. Thank to Andrew Krasny for narrowing down the root cause. Reviewers: ecbeckmann Reviewed By: ecbeckmann Subscribers: mgorny, llvm-commits Differential Revision: https://reviews.llvm.org/D38875 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@316064 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 7f33591de0c..a1b4846f19a 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -157,7 +157,7 @@ if( NOT PURE_WINDOWS AND NOT LLVM_USE_SANITIZER MATCHES "Memory.*") set(HAVE_TERMINFO 0) endif() - find_library(ICONV_LIBRARY_PATH NAMES iconv libiconv libiconv-2 c) + find_library(ICONV_LIBRARY_PATH NAMES iconv libiconv libiconv-2) set(LLVM_LIBXML2_ENABLED 0) set(LIBXML2_FOUND 0) if((LLVM_ENABLE_LIBXML2) AND ((CMAKE_SYSTEM_NAME MATCHES "Linux") AND (ICONV_LIBRARY_PATH) OR APPLE))