diff options
Diffstat (limited to 'lib/ToolDrivers/llvm-lib')
| -rw-r--r-- | lib/ToolDrivers/llvm-lib/LLVMBuild.txt | 2 | ||||
| -rw-r--r-- | lib/ToolDrivers/llvm-lib/LibDriver.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/ToolDrivers/llvm-lib/LLVMBuild.txt b/lib/ToolDrivers/llvm-lib/LLVMBuild.txt index 799dc997c0bb..e4b32ec4af90 100644 --- a/lib/ToolDrivers/llvm-lib/LLVMBuild.txt +++ b/lib/ToolDrivers/llvm-lib/LLVMBuild.txt @@ -19,4 +19,4 @@ type = Library name = LibDriver parent = Libraries -required_libraries = Object Option Support +required_libraries = BinaryFormat Object Option Support diff --git a/lib/ToolDrivers/llvm-lib/LibDriver.cpp b/lib/ToolDrivers/llvm-lib/LibDriver.cpp index 3bae3826d62e..797e4ffc2d45 100644 --- a/lib/ToolDrivers/llvm-lib/LibDriver.cpp +++ b/lib/ToolDrivers/llvm-lib/LibDriver.cpp @@ -14,14 +14,15 @@ #include "llvm/ToolDrivers/llvm-lib/LibDriver.h" #include "llvm/ADT/STLExtras.h" +#include "llvm/BinaryFormat/Magic.h" #include "llvm/Object/ArchiveWriter.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" #include "llvm/Option/Option.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/StringSaver.h" #include "llvm/Support/Path.h" #include "llvm/Support/Process.h" +#include "llvm/Support/StringSaver.h" #include "llvm/Support/raw_ostream.h" using namespace llvm; @@ -143,11 +144,10 @@ int llvm::libDriverMain(llvm::ArrayRef<const char*> ArgsArr) { }); return 1; } - 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 && - Magic != sys::fs::file_magic::windows_resource) { + llvm::file_magic Magic = llvm::identify_magic(MOrErr->Buf->getBuffer()); + if (Magic != llvm::file_magic::coff_object && + Magic != llvm::file_magic::bitcode && + Magic != llvm::file_magic::windows_resource) { llvm::errs() << Arg->getValue() << ": not a COFF object, bitcode or resource file\n"; return 1; |