mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-25 20:23:11 +01:00
Remove clang-specific libxml2 check from CMake
clang's own CMake setup handles this as of r210308. The CMAKE_CROSSCOMPILING special-case will no longer be hard-coded. This was clearly site-specific to someone's local configuration and should be passed in at configure time if needed with e.g. -DLIBXML2_LIBRARIES=... (the libxml2 target I tried here doesn't even support liblzma so it's *way* off). llvm-svn: 210309
This commit is contained in:
parent
b2193098c8
commit
28908bcd36
@ -298,25 +298,6 @@ else()
|
||||
set(ENABLE_PIC 0)
|
||||
endif()
|
||||
|
||||
find_package(LibXml2)
|
||||
if (LIBXML2_FOUND)
|
||||
set(CLANG_HAVE_LIBXML 1)
|
||||
# When cross-compiling, liblzma is not detected as a dependency for libxml2,
|
||||
# which makes linking c-index-test fail. But for native builds, all libraries
|
||||
# are installed and checked by CMake before Makefiles are generated and everything
|
||||
# works according to the plan. However, if a -llzma is added to native builds,
|
||||
# an additional requirement on the static liblzma.a is required, but will not
|
||||
# be checked by CMake, breaking native compilation.
|
||||
# Since this is only pertinent to cross-compilations, and there's no way CMake
|
||||
# can check for every foreign library on every OS, we add the dep and warn the dev.
|
||||
if ( CMAKE_CROSSCOMPILING )
|
||||
if (NOT PC_LIBXML_VERSION VERSION_LESS "2.8.0")
|
||||
message(STATUS "Adding LZMA as a dep to XML2 for cross-compilation, make sure liblzma.a is available.")
|
||||
set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} "-llzma")
|
||||
endif ()
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
check_cxx_compiler_flag("-Wno-variadic-macros" SUPPORTS_NO_VARIADIC_MACROS_FLAG)
|
||||
|
||||
set(USE_NO_MAYBE_UNINITIALIZED 0)
|
||||
|
Loading…
Reference in New Issue
Block a user