summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorEric Beckmann <ecbeckmann@google.com>2017-07-21 02:13:02 +0000
committerEric Beckmann <ecbeckmann@google.com>2017-07-21 02:13:02 +0000
commit54137ed125b59c6212c7ffeb0646b327d0ae0f30 (patch)
tree3932a6666f44aacaa574e1ea7131ef4c61d7a877 /llvm
parent98dc59979026d7e46a3ca7633c988e15ce92ff05 (diff)
downloadbcm5719-llvm-54137ed125b59c6212c7ffeb0646b327d0ae0f30.tar.gz
bcm5719-llvm-54137ed125b59c6212c7ffeb0646b327d0ae0f30.zip
Only use xml if iconv is found, which is a prerequisite.
llvm-svn: 308711
Diffstat (limited to 'llvm')
-rw-r--r--llvm/cmake/config-ix.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
index 88a7c909e6c..c08fdd1a3ff 100644
--- a/llvm/cmake/config-ix.cmake
+++ b/llvm/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)
OpenPOWER on IntegriCloud