]> granicus.if.org Git - llvm/commitdiff
Only use xml if iconv is found, which is a prerequisite.
authorEric Beckmann <ecbeckmann@google.com>
Fri, 21 Jul 2017 02:13:02 +0000 (02:13 +0000)
committerEric Beckmann <ecbeckmann@google.com>
Fri, 21 Jul 2017 02:13:02 +0000 (02:13 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@308711 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/config-ix.cmake

index 88a7c909e6c8a653f3182d13e5d8c995f85f5d1d..c08fdd1a3ff789db5adb8fd444c8d429893ba518 100644 (file)
@@ -156,9 +156,10 @@ 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)
   set(LLVM_LIBXML2_ENABLED 0)
   set(LIBXML2_FOUND 0)
-  if(LLVM_ENABLE_LIBXML2 AND CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT ANDROID)
+  if(LLVM_ENABLE_LIBXML2 AND CMAKE_SYSTEM_NAME MATCHES "Linux" AND ICONV_LIBRARY_PATH)
     find_package(LibXml2)
     if (LIBXML2_FOUND)
       set(LLVM_LIBXML2_ENABLED 1)