diff options
| author | emaste <emaste@FreeBSD.org> | 2014-02-17 18:50:03 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-02-17 18:50:03 +0000 |
| commit | 810005931a8dbd852fb7f049fa9662665631c207 (patch) | |
| tree | e6b1527ed8fbf17bf3704be458cae387153e2a3c /contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp | |
| parent | 1f817e386c252eef2d6bc2933a1c061991fb0de8 (diff) | |
| download | FreeBSD-src-810005931a8dbd852fb7f049fa9662665631c207.zip FreeBSD-src-810005931a8dbd852fb7f049fa9662665631c207.tar.gz | |
Update lldb for clang/llvm 3.4 import
This commit largely restores the lldb source to the upstream r196259
snapshot with the addition of threaded inferior support and a few bug
fixes.
Specific upstream lldb revisions restored include:
SVN git
181387 779e6ac
181703 7bef4e2
182099 b31044e
182650 f2dcf35
182683 0d91b80
183862 15c1774
183929 99447a6
184177 0b2934b
184948 4dc3761
184954 007e7bc
186990 eebd175
Sponsored by: DARPA, AFRL
Diffstat (limited to 'contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp')
| -rw-r--r-- | contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp b/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp index fc41f06..48f1ac7 100644 --- a/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp +++ b/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp @@ -570,9 +570,8 @@ FileSpec::ResolveExecutableLocation () if (file_cstr) { const std::string file_str (file_cstr); - llvm::sys::Path path = llvm::sys::Program::FindProgramByName (file_str); - const std::string &path_str = path.str(); - llvm::StringRef dir_ref = llvm::sys::path::parent_path(path_str); + std::string path = llvm::sys::FindProgramByName (file_str); + llvm::StringRef dir_ref = llvm::sys::path::parent_path(path); //llvm::StringRef dir_ref = path.getDirname(); if (! dir_ref.empty()) { |
