<div dir="ltr">Hi Saleem,<div><br></div><div>I've temporarily reverted this here:</div><div><br></div><div>echristo@jhereg ~/s/llvm-project> git push<br>To github.com:llvm/llvm-project.git<br>   936de1c5bc2..2e75681b55a  master -> master<br></div><div><br></div><div>after the breakage in llvm-config --system-libs that was reported on the bug. Sorry for the inconvenience and if there's anything you need.</div><div><br></div><div>-eric</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Nov 27, 2019 at 12:36 PM Saleem Abdulrasool via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Saleem Abdulrasool<br>
Date: 2019-11-27T12:36:25-08:00<br>
New Revision: 340e7c0b77a7037afefe7255503afe362967b577<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/340e7c0b77a7037afefe7255503afe362967b577" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/340e7c0b77a7037afefe7255503afe362967b577</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/340e7c0b77a7037afefe7255503afe362967b577.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/340e7c0b77a7037afefe7255503afe362967b577.diff</a><br>
<br>
LOG: build: avoid hardcoding the libxml2 library name<br>
<br>
FindLibXml2 will set the LIBXML2_LIBRARIES variable to the libraries that<br>
we must link against. This will be an empty string if libxml2 is not<br>
found. Avoid hardcoding the library name as xml2 in the configuration.<br>
Simplify the usage in the WindowsManifest library.<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
    llvm/cmake/config-ix.cmake<br>
    llvm/lib/WindowsManifest/CMakeLists.txt<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff  --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake<br>
index 028a2cc86bf3..e7e5e5dcf2ff 100644<br>
--- a/llvm/cmake/config-ix.cmake<br>
+++ b/llvm/cmake/config-ix.cmake<br>
@@ -166,7 +166,6 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*")<br>
         else()<br>
           include_directories(${LIBXML2_INCLUDE_DIR})<br>
         endif()<br>
-        set(LIBXML2_LIBS "xml2")<br>
       endif()<br>
     endif()<br>
   endif()<br>
<br>
diff  --git a/llvm/lib/WindowsManifest/CMakeLists.txt b/llvm/lib/WindowsManifest/CMakeLists.txt<br>
index 4f2d011d5434..8868564da76f 100644<br>
--- a/llvm/lib/WindowsManifest/CMakeLists.txt<br>
+++ b/llvm/lib/WindowsManifest/CMakeLists.txt<br>
@@ -1,10 +1,3 @@<br>
-set(system_libs)<br>
-if( CMAKE_HOST_UNIX )<br>
-  if( LLVM_LIBXML2_ENABLED )<br>
-    set(system_libs ${system_libs} ${LIBXML2_LIBS})<br>
-  endif()<br>
-endif()<br>
-<br>
 add_llvm_component_library(LLVMWindowsManifest<br>
   WindowsManifestMerger.cpp<br>
<br>
@@ -12,7 +5,8 @@ add_llvm_component_library(LLVMWindowsManifest<br>
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/WindowsManifest<br>
   ${Backtrace_INCLUDE_DIRS}<br>
<br>
-  LINK_LIBS ${system_libs}<br>
+  LINK_LIBS ${LIBXML2_LIBRARIES}<br>
   )<br>
<br>
-set_property(TARGET LLVMWindowsManifest PROPERTY LLVM_SYSTEM_LIBS "${system_libs}")<br>
+set_property(TARGET LLVMWindowsManifest PROPERTY<br>
+  LLVM_SYSTEM_LIBS ${LIBXML2_LIBRARIES})<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>