Revert "Don't include directory names in archives."

This reverts commit 184420.
Investigating the bot failures.

llvm-svn: 184421

1 files changed, 8 insertions, 0 deletions

diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp
index 941b6310804..36bec4206d3 100644
--- a/llvm/tools/llvm-ar/llvm-ar.cpp
+++ b/llvm/tools/llvm-ar/llvm-ar.cpp
@@ -399,6 +399,14 @@ doExtract(std::string* ErrMsg) {
     if (Paths.empty() ||
         (std::find(Paths.begin(), Paths.end(), I->getPath()) != Paths.end())) {
 
+      // Make sure the intervening directories are created
+      if (I->hasPath()) {
+        sys::Path dirs(I->getPath());
+        dirs.eraseComponent();
+        if (dirs.createDirectoryOnDisk(/*create_parents=*/true, ErrMsg))
+          return true;
+      }
+
       // Open up a file stream for writing
       std::ios::openmode io_mode = std::ios::out | std::ios::trunc |
                                    std::ios::binary;