diff options
author | Peter Collingbourne <peter@pcc.me.uk> | 2016-12-15 19:37:46 +0000 |
---|---|---|
committer | Peter Collingbourne <peter@pcc.me.uk> | 2016-12-15 19:37:46 +0000 |
commit | e089554c8f6bffff5ff9df9e67b5217eafbeb8a6 (patch) | |
tree | 33042341a9b939cf900c3109b0ba5d2d4c7bfd7c /llvm/lib | |
parent | 578113ffb7d95705e1a9cb825e23e894e5ac14d6 (diff) | |
download | bcm5719-llvm-e089554c8f6bffff5ff9df9e67b5217eafbeb8a6.tar.gz bcm5719-llvm-e089554c8f6bffff5ff9df9e67b5217eafbeb8a6.zip |
LibDriver: Allow resource files to be archive members.
It seems pointless to add a resource to an archive because it won't have
any symbols to link against (and link.exe doesn't have an equivalent of
--whole-archive), but lib.exe allows it for some reason.
llvm-svn: 289859
Diffstat (limited to 'llvm/lib')
-rw-r--r-- | llvm/lib/LibDriver/LibDriver.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/LibDriver/LibDriver.cpp b/llvm/lib/LibDriver/LibDriver.cpp index fa9f02c959d..bcdec4f7a93 100644 --- a/llvm/lib/LibDriver/LibDriver.cpp +++ b/llvm/lib/LibDriver/LibDriver.cpp @@ -146,8 +146,10 @@ int llvm::libDriverMain(llvm::ArrayRef<const char*> ArgsArr) { sys::fs::file_magic Magic = sys::fs::identify_magic(MOrErr->Buf->getBuffer()); if (Magic != sys::fs::file_magic::coff_object && - Magic != sys::fs::file_magic::bitcode) { - llvm::errs() << Arg->getValue() << ": not a COFF object or bitcode file\n"; + Magic != sys::fs::file_magic::bitcode && + Magic != sys::fs::file_magic::windows_resource) { + llvm::errs() << Arg->getValue() + << ": not a COFF object, bitcode or resource file\n"; return 1; } Members.emplace_back(std::move(*MOrErr)); |