diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-20 18:30:37 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-20 18:30:37 +0000 |
commit | b0c3cac2ed0d2e3ad94dee46cbd0ab7ad1b1dabc (patch) | |
tree | 1fc5102a729b6481527767249679da56be8cc9da /llvm/tools/llvm-ar/llvm-ar.cpp | |
parent | d7c0561ad0fb17282456db5e885e406dd523dda7 (diff) | |
download | bcm5719-llvm-b0c3cac2ed0d2e3ad94dee46cbd0ab7ad1b1dabc.tar.gz bcm5719-llvm-b0c3cac2ed0d2e3ad94dee46cbd0ab7ad1b1dabc.zip |
Use only the filename when deciding if a file is a duplicate.
Matches gnu ar behavior.
llvm-svn: 184448
Diffstat (limited to 'llvm/tools/llvm-ar/llvm-ar.cpp')
-rw-r--r-- | llvm/tools/llvm-ar/llvm-ar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index 941b6310804..4c986715aec 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -563,7 +563,7 @@ doReplaceOrInsert(std::string* ErrMsg) { std::set<std::string>::iterator found = remaining.end(); for (std::set<std::string>::iterator RI = remaining.begin(), RE = remaining.end(); RI != RE; ++RI ) { - std::string compare(*RI); + std::string compare(sys::path::filename(*RI)); if (TruncateNames && compare.length() > 15) { const char* nm = compare.c_str(); unsigned len = compare.length(); |