diff options
| -rw-r--r-- | llvm/test/tools/llvm-ar/print-thin-archive-path.test | 10 | ||||
| -rw-r--r-- | llvm/tools/llvm-ar/llvm-ar.cpp | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/llvm/test/tools/llvm-ar/print-thin-archive-path.test b/llvm/test/tools/llvm-ar/print-thin-archive-path.test new file mode 100644 index 00000000000..f6cb0cf7518 --- /dev/null +++ b/llvm/test/tools/llvm-ar/print-thin-archive-path.test @@ -0,0 +1,10 @@ +RUN: mkdir -p %t/foo +RUN: touch %t/foo/a.txt +RUN: rm -f %t/foo/archive.a + +RUN: cd %t && llvm-ar rcST foo/archive.a foo/a.txt +RUN: cd %t && llvm-ar t foo/archive.a | FileCheck %s --match-full-lines --check-prefix=PARENT-DIR +RUN: cd %t/foo && llvm-ar t archive.a | FileCheck %s --match-full-lines --check-prefix=CHILD-DIR + +PARENT-DIR: foo/a.txt +CHILD-DIR: a.txt diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index 99dc7fdd6d7..0119ec502e5 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -429,8 +429,9 @@ static void doDisplayTable(StringRef Name, const object::Archive::Child &C) { } if (C.getParent()->isThin()) { - outs() << sys::path::parent_path(ArchiveName); - outs() << '/'; + StringRef ParentDir = sys::path::parent_path(ArchiveName); + if (!ParentDir.empty()) + outs() << ParentDir << '/'; } outs() << Name << "\n"; } |
