diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2019-12-03 09:27:14 -0800 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2019-12-03 09:27:14 -0800 |
| commit | abe8de29c4ae5eca86f3594d2edd43b2fcbda623 (patch) | |
| tree | 400a98de757626832e805373f06879d0ab49d8cf /llvm | |
| parent | 26748a321e20a7aa952ce8daa4f030c384ae7032 (diff) | |
| download | bcm5719-llvm-abe8de29c4ae5eca86f3594d2edd43b2fcbda623.tar.gz bcm5719-llvm-abe8de29c4ae5eca86f3594d2edd43b2fcbda623.zip | |
Revert "Temporarily revert "build: avoid hardcoding the libxml2 library name""
This reverts commit 2e75681b55ab55301022533b203269f5f3d6f909. Restore
the clean up change. The underlying CMake issue was resolved in
372ad32734ecb455f9fb4d0601229ca2dfc78b66.
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/cmake/config-ix.cmake | 1 | ||||
| -rw-r--r-- | llvm/lib/WindowsManifest/CMakeLists.txt | 18 |
2 files changed, 6 insertions, 13 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index 028a2cc86bf..e7e5e5dcf2f 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -166,7 +166,6 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*") else() include_directories(${LIBXML2_INCLUDE_DIR}) endif() - set(LIBXML2_LIBS "xml2") endif() endif() endif() diff --git a/llvm/lib/WindowsManifest/CMakeLists.txt b/llvm/lib/WindowsManifest/CMakeLists.txt index 4f2d011d543..fe6ddcd414d 100644 --- a/llvm/lib/WindowsManifest/CMakeLists.txt +++ b/llvm/lib/WindowsManifest/CMakeLists.txt @@ -1,18 +1,12 @@ -set(system_libs) -if( CMAKE_HOST_UNIX ) - if( LLVM_LIBXML2_ENABLED ) - set(system_libs ${system_libs} ${LIBXML2_LIBS}) - endif() -endif() - add_llvm_component_library(LLVMWindowsManifest WindowsManifestMerger.cpp ADDITIONAL_HEADER_DIRS ${LLVM_MAIN_INCLUDE_DIR}/llvm/WindowsManifest - ${Backtrace_INCLUDE_DIRS} + ${Backtrace_INCLUDE_DIRS}) - LINK_LIBS ${system_libs} - ) - -set_property(TARGET LLVMWindowsManifest PROPERTY LLVM_SYSTEM_LIBS "${system_libs}") +if(LIBXML2_LIBRARIES) + target_link_libraries(LLVMWindowsManifest PUBLIC ${LIBXML2_LIBRARIES}) + set_property(TARGET LLVMWindowsManifest PROPERTY + LLVM_SYSTEM_LIBS ${LIBXML2_LIBRARIES}) +endif() |
