inhereit LLVM_ENABLE_LIBXML2

[david2050]

Summary

When building in an LLVM context, we should respect its LLVM_ENABLE_LIBXML2 option.

[mgorny]

CMakeLists.txt

92 ↗

(On Diff #169480)

I suppose it will work better without typos.

[david2050]

fix typo

[modocache]

Sorry to have let this languish! LGTM.

cfe/trunk/CMakeLists.txt

if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
 
   option(LLVM_ENABLE_WARNINGS "Enable compiler warnings." ON)
   option(LLVM_INSTALL_TOOLCHAIN_ONLY
     "Only include toolchain files in the 'install' target." OFF)
 
   option(LLVM_FORCE_USE_OLD_HOST_TOOLCHAIN
     "Set to ON to force using an old, unsupported host toolchain." OFF)
   option(CLANG_ENABLE_BOOTSTRAP "Generate the clang bootstrap target" OFF)
+  option(LLVM_ENABLE_LIBXML2 "Use libxml2 if available." ON)
 
   include(AddLLVM)
   include(TableGen)
   include(HandleLLVMOptions)
   include(VersionFromVCS)
 
   set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
 

 else()
   set(BACKEND_PACKAGE_STRING "${PACKAGE_STRING}")
 endif()
 
 # Make sure that our source directory is on the current cmake module path so that
 # we can include cmake files from this directory.
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
+if(LLVM_ENABLE_LIBXML2)
   # Don't look for libxml if we're using MSan, since uninstrumented third party
   # code may call MSan interceptors like strlen, leading to false positives.
   if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*")
     set (LIBXML2_FOUND 0)
     find_package(LibXml2 2.5.3 QUIET)
     if (LIBXML2_FOUND)
       set(CLANG_HAVE_LIBXML 1)
     endif()
   endif()
+endif()
 
 include(CheckIncludeFile)
 check_include_file(sys/resource.h CLANG_HAVE_RLIMITS)
 
 set(CLANG_RESOURCE_DIR "" CACHE STRING
   "Relative directory from the Clang binary to its resource files.")
 
 set(C_INCLUDE_DIRS "" CACHE STRING