summaryrefslogtreecommitdiff
path: root/tools/llvm-ar
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-07-05 13:03:07 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-07-05 13:03:07 +0000
commit61de142984aa6cb1acfe4725183193d04e437420 (patch)
tree804d53c9da0e26da98e2b3188cd93e41553e3bec /tools/llvm-ar
parent7271ac2c0318043688ddc8686dd23777dca62c59 (diff)
downloadllvm-61de142984aa6cb1acfe4725183193d04e437420.tar.gz
llvm-61de142984aa6cb1acfe4725183193d04e437420.tar.bz2
llvm-61de142984aa6cb1acfe4725183193d04e437420.tar.xz
Don't create an archive if, for example, we are asked to print the index.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185697 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-ar')
-rw-r--r--tools/llvm-ar/llvm-ar.cpp21
1 files changed, 19 insertions, 2 deletions
diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp
index 5370715491..515f8991e8 100644
--- a/tools/llvm-ar/llvm-ar.cpp
+++ b/tools/llvm-ar/llvm-ar.cpp
@@ -642,6 +642,21 @@ doReplaceOrInsert(std::string* ErrMsg) {
return false;
}
+bool shouldCreateArchive(ArchiveOperation Op) {
+ switch (Op) {
+ case Print:
+ case Delete:
+ case Move:
+ case DisplayTable:
+ case Extract:
+ return false;
+
+ case QuickAppend:
+ case ReplaceOrInsert:
+ return true;
+ }
+}
+
// main - main program for llvm-ar .. see comments in the code
int main(int argc, char **argv) {
program_name = argv[0];
@@ -665,13 +680,15 @@ int main(int argc, char **argv) {
ArchiveOperation Operation = parseCommandLine();
// Create or open the archive object.
- if (!llvm::sys::fs::exists(ArchiveName)) {
+ if (shouldCreateArchive(Operation) && !llvm::sys::fs::exists(ArchiveName)) {
// Produce a warning if we should and we're creating the archive
if (!Create)
errs() << argv[0] << ": creating " << ArchiveName << "\n";
TheArchive = Archive::CreateEmpty(ArchiveName, Context);
TheArchive->writeToDisk();
- } else {
+ }
+
+ if (!TheArchive) {
std::string Error;
TheArchive = Archive::OpenAndLoad(ArchiveName, Context, &Error);
if (TheArchive == 0) {