diff options
| author | Eric Beckmann <ecbeckmann@google.com> | 2017-08-22 03:15:28 +0000 |
|---|---|---|
| committer | Eric Beckmann <ecbeckmann@google.com> | 2017-08-22 03:15:28 +0000 |
| commit | 3c6e126a27d498e9a7efe5f79bb8ec6e2ff45f4e (patch) | |
| tree | a72a3b1e53d10740c690e150e96216a2415f4490 /lib/WindowsManifest | |
| parent | 88b828e2532e11d6bb309cdc39df08445b5debca (diff) | |
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
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@311424 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/WindowsManifest')
| -rw-r--r-- | lib/WindowsManifest/WindowsManifestMerger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/WindowsManifest/WindowsManifestMerger.cpp b/lib/WindowsManifest/WindowsManifestMerger.cpp index fe20ec73528..91547c98469 100644 --- a/lib/WindowsManifest/WindowsManifestMerger.cpp +++ b/lib/WindowsManifest/WindowsManifestMerger.cpp @@ -671,7 +671,7 @@ WindowsManifestMerger::WindowsManifestMergerImpl::~WindowsManifestMergerImpl() { Error WindowsManifestMerger::WindowsManifestMergerImpl::merge( const MemoryBuffer &Manifest) { - return Error::success(); + return make_error<WindowsManifestError>("no libxml2"); } std::unique_ptr<MemoryBuffer> |