]> granicus.if.org Git - llvm/commitdiff
Fix the incorrect detection of ICONV_LIBRARY_PATH
authorSerguei Katkov <serguei.katkov@azul.com>
Wed, 18 Oct 2017 06:26:39 +0000 (06:26 +0000)
committerSerguei Katkov <serguei.katkov@azul.com>
Wed, 18 Oct 2017 06:26:39 +0000 (06:26 +0000)
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

cmake/config-ix.cmake

index 7f33591de0c89fdff0fbaeb10f831e8caaee55ce..a1b4846f19ab13efa03363d7c3c5cbabff123476 100644 (file)
@@ -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))