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 | 87c6acf38a2030883ddf94ddbed6ff27ab2288f4 (patch) | |
| tree | 80a19f78a40728264940100a0afae1db51d86c72 /llvm/lib | |
| parent | 6683c81af8f4764d589ca60f6aff4f1927eed616 (diff) | |
| download | bcm5719-llvm-87c6acf38a2030883ddf94ddbed6ff27ab2288f4.tar.gz bcm5719-llvm-87c6acf38a2030883ddf94ddbed6ff27ab2288f4.zip | |
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
llvm-svn: 311424
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/WindowsManifest/WindowsManifestMerger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/WindowsManifest/WindowsManifestMerger.cpp b/llvm/lib/WindowsManifest/WindowsManifestMerger.cpp index fe20ec73528..91547c98469 100644 --- a/llvm/lib/WindowsManifest/WindowsManifestMerger.cpp +++ b/llvm/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> |
