diff options
| author | Eric Beckmann <ecbeckmann@google.com> | 2017-09-06 01:50:36 +0000 |
|---|---|---|
| committer | Eric Beckmann <ecbeckmann@google.com> | 2017-09-06 01:50:36 +0000 |
| commit | 0aa4b7d4c5e97b5157a784848d977fc142918ef2 (patch) | |
| tree | be89a2f1fbe57b2fe7196a0496ac48fb7b78a633 /llvm/lib | |
| parent | dc8b7a96bdccc73c5f4ca1baef45afba6d405908 (diff) | |
| download | bcm5719-llvm-0aa4b7d4c5e97b5157a784848d977fc142918ef2.tar.gz bcm5719-llvm-0aa4b7d4c5e97b5157a784848d977fc142918ef2.zip | |
Fix crbug 759265 by suppressing llvm mt warnings.
Summary:
Previous would throw warning whenever libxml2 is not installed. Now
only give this warning if merging manifest fails.
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D37240
llvm-svn: 312604
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/WindowsManifest/WindowsManifestMerger.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/llvm/lib/WindowsManifest/WindowsManifestMerger.cpp b/llvm/lib/WindowsManifest/WindowsManifestMerger.cpp index 2d443a5ca2d..f2f2187bbac 100644 --- a/llvm/lib/WindowsManifest/WindowsManifestMerger.cpp +++ b/llvm/lib/WindowsManifest/WindowsManifestMerger.cpp @@ -682,6 +682,8 @@ WindowsManifestMerger::WindowsManifestMergerImpl::getMergedManifest() { : nullptr; } +bool windows_manifest::isAvailable() { return true; } + #else WindowsManifestMerger::WindowsManifestMergerImpl::~WindowsManifestMergerImpl() { @@ -697,6 +699,8 @@ WindowsManifestMerger::WindowsManifestMergerImpl::getMergedManifest() { return nullptr; } +bool windows_manifest::isAvailable() { return false; } + #endif WindowsManifestMerger::WindowsManifestMerger() |
