[llvm] r308711 - Only use xml if iconv is found, which is a prerequisite.

[Eric Beckmann via llvm-commits]

Author: ecbeckmann
Date: Thu Jul 20 19:13:02 2017
New Revision: 308711

URL: http://llvm.org/viewvc/llvm-project?rev=308711&view=rev
Log:
Only use xml if iconv is found, which is a prerequisite.

Modified:
    llvm/trunk/cmake/config-ix.cmake

Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=308711&r1=308710&r2=308711&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Thu Jul 20 19:13:02 2017
@@ -156,9 +156,10 @@ if( NOT PURE_WINDOWS AND NOT LLVM_USE_SA
     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)