diff options
| author | Manuel Klimek <klimek@google.com> | 2013-07-08 14:44:57 +0000 |
|---|---|---|
| committer | Manuel Klimek <klimek@google.com> | 2013-07-08 14:44:57 +0000 |
| commit | c9b82d76e27e4b76dc703670c167c4e5f3071250 (patch) | |
| tree | 5a2e5949dc1824045cfe60c68b4226960f640dc8 | |
| parent | 12493bb7d584afa01a64659d300b10c4dfdb0755 (diff) | |
| download | llvm-c9b82d76e27e4b76dc703670c167c4e5f3071250.zip llvm-c9b82d76e27e4b76dc703670c167c4e5f3071250.tar.gz llvm-c9b82d76e27e4b76dc703670c167c4e5f3071250.tar.bz2 | |
Fixes problem when calling llvm-ar from an unmodifiable directory.
This fixes a regression introduced by r185726: the new call to get
a unique file does not prepend the system temporary directory, so
we need to anchor on the file that the temporary file gets moved
to to ensure we're on the same file system.
llvm-svn: 185825
| -rw-r--r-- | llvm/tools/llvm-ar/ArchiveWriter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/tools/llvm-ar/ArchiveWriter.cpp b/llvm/tools/llvm-ar/ArchiveWriter.cpp index 52ce045..ef91001 100644 --- a/llvm/tools/llvm-ar/ArchiveWriter.cpp +++ b/llvm/tools/llvm-ar/ArchiveWriter.cpp @@ -260,8 +260,8 @@ bool Archive::writeToDisk(bool TruncateNames, std::string *ErrMsg) { // Create a temporary file to store the archive in int TmpArchiveFD; SmallString<128> TmpArchive; - error_code EC = sys::fs::createUniqueFile("temp-archive-%%%%%%%.a", - TmpArchiveFD, TmpArchive); + error_code EC = sys::fs::createUniqueFile( + archPath + ".temp-archive-%%%%%%%.a", TmpArchiveFD, TmpArchive); if (EC) return true; |