[llvm] r311424 - Integrate manifest merging library into LLD.

[Eric Beckmann via llvm-commits]

Author: ecbeckmann
Date: Mon Aug 21 20:15:28 2017
New Revision: 311424

URL: http://llvm.org/viewvc/llvm-project?rev=311424&view=rev
Log:
Integrate manifest merging library into LLD.

Summary: Now that the llvm-mt manifest merging libraries are complete, we may use them to merge manifests instead of needing to shell out to mt.exe.

Subscribers: mgorny, llvm-commits

Differential Revision: https://reviews.llvm.org/D36255

Modified:
    llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp

Modified: llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp?rev=311424&r1=311423&r2=311424&view=diff
==============================================================================
--- llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp (original)
+++ llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp Mon Aug 21 20:15:28 2017
@@ -671,7 +671,7 @@ WindowsManifestMerger::WindowsManifestMe
 
 Error WindowsManifestMerger::WindowsManifestMergerImpl::merge(
     const MemoryBuffer &Manifest) {
-  return Error::success();
+  return make_error<WindowsManifestError>("no libxml2");
 }
 
 std::unique_ptr<MemoryBuffer>