diff options
author | Dmitri Gribenko <gribozavr@gmail.com> | 2019-06-03 16:21:37 +0000 |
---|---|---|
committer | Dmitri Gribenko <gribozavr@gmail.com> | 2019-06-03 16:21:37 +0000 |
commit | 857de979a7e43f26973351931b93a3879a09ec5a (patch) | |
tree | 86b92cc246e83d6b219952bd74d98c4ef79155d7 /llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp | |
parent | 009d08f313c46915930ca617946033a487933b73 (diff) | |
download | llvm-857de979a7e43f26973351931b93a3879a09ec5a.zip llvm-857de979a7e43f26973351931b93a3879a09ec5a.tar.gz llvm-857de979a7e43f26973351931b93a3879a09ec5a.tar.bz2 |
Revert "[llvm-ar] Fix relative thin archive path handling"
This reverts commit r362407. It broke compilation of
llvm/lib/Object/ArchiveWriter.cpp:
error: type 'llvm::sys::path::const_iterator' does not provide a call
operator
llvm-svn: 362413
Diffstat (limited to 'llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp')
-rw-r--r-- | llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp index 2d44686..34a8314 100644 --- a/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp +++ b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp @@ -211,14 +211,9 @@ int llvm::libDriverMain(ArrayRef<const char *> ArgsArr) { // llvm-lib uses relative paths for both regular and thin archives, unlike // standard GNU ar, which only uses relative paths for thin archives and // basenames for regular archives. - for (NewArchiveMember &Member : Members) { - if (sys::path::is_relative(Member.MemberName)) { - Expected<std::string> PathOrErr = - computeArchiveRelativePath(OutputPath, Member.MemberName); - if (PathOrErr) - Member.MemberName = Saver.save(*PathOrErr); - } - } + for (NewArchiveMember &Member : Members) + Member.MemberName = + Saver.save(computeArchiveRelativePath(OutputPath, Member.MemberName)); if (Error E = writeArchive(OutputPath, Members, |