From: Nico Weber Date: Sun, 15 Oct 2017 19:13:57 +0000 (+0000) Subject: Search for libxml2 on macOS too. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d03e64f7534aae7e6f7bb2e90823c44a8d15ca47;p=llvm Search for libxml2 on macOS too. This allows lld-link to process /manifestinput: flags on macOS too. Also makes the `REQUIRES: manifesttool` lld tests run on macOS. Setting LLVM_ENABLE_LIBXML2 to off can suppress this behavior, like on Linux. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315873 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index f13e6f78340..7f33591de0c 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -160,7 +160,7 @@ if( NOT PURE_WINDOWS AND NOT LLVM_USE_SANITIZER MATCHES "Memory.*") 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 (ICONV_LIBRARY_PATH)) + if((LLVM_ENABLE_LIBXML2) AND ((CMAKE_SYSTEM_NAME MATCHES "Linux") AND (ICONV_LIBRARY_PATH) OR APPLE)) find_package(LibXml2) if (LIBXML2_FOUND) set(LLVM_LIBXML2_ENABLED 1)