From 857de979a7e43f26973351931b93a3879a09ec5a Mon Sep 17 00:00:00 2001 From: Dmitri Gribenko Date: Mon, 3 Jun 2019 16:21:37 +0000 Subject: 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 --- llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp') 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 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 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, -- cgit v1.1