From: Eric Beckmann <ecbeckmann@google.com>
Date: Fri, 21 Jul 2017 02:13:02 +0000 (+0000)
Subject: Only use xml if iconv is found, which is a prerequisite.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d761f4904ef79e3b5bb8b5a198f4b6bdb07f194c;p=llvm

Only use xml if iconv is found, which is a prerequisite.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@308711 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 88a7c909e6c..c08fdd1a3ff 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -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)