diff options
Diffstat (limited to 'source/Host/linux/HostInfoLinux.cpp')
| -rw-r--r-- | source/Host/linux/HostInfoLinux.cpp | 12 | 
1 files changed, 7 insertions, 5 deletions
diff --git a/source/Host/linux/HostInfoLinux.cpp b/source/Host/linux/HostInfoLinux.cpp index 1d95010e2f73..f5a6b2c97a0d 100644 --- a/source/Host/linux/HostInfoLinux.cpp +++ b/source/Host/linux/HostInfoLinux.cpp @@ -7,8 +7,9 @@  //  //===----------------------------------------------------------------------===// -#include "lldb/Host/Config.h"  #include "lldb/Host/linux/HostInfoLinux.h" +#include "lldb/Host/Config.h" +#include "lldb/Host/FileSystem.h"  #include "lldb/Utility/Log.h"  #include "llvm/Support/Threading.h" @@ -20,7 +21,7 @@  #include <unistd.h>  #include <algorithm> -#include <mutex> // std::once +#include <mutex>  using namespace lldb_private; @@ -170,7 +171,7 @@ FileSpec HostInfoLinux::GetProgramFileSpec() {      ssize_t len = readlink("/proc/self/exe", exe_path, sizeof(exe_path) - 1);      if (len > 0) {        exe_path[len] = 0; -      g_program_filespec.SetFile(exe_path, false, FileSpec::Style::native); +      g_program_filespec.SetFile(exe_path, FileSpec::Style::native);      }    } @@ -179,14 +180,15 @@ FileSpec HostInfoLinux::GetProgramFileSpec() {  bool HostInfoLinux::ComputeSupportExeDirectory(FileSpec &file_spec) {    if (HostInfoPosix::ComputeSupportExeDirectory(file_spec) && -      file_spec.IsAbsolute() && file_spec.Exists()) +      file_spec.IsAbsolute() && FileSystem::Instance().Exists(file_spec))      return true;    file_spec.GetDirectory() = GetProgramFileSpec().GetDirectory();    return !file_spec.GetDirectory().IsEmpty();  }  bool HostInfoLinux::ComputeSystemPluginsDirectory(FileSpec &file_spec) { -  FileSpec temp_file("/usr/lib" LLDB_LIBDIR_SUFFIX "/lldb/plugins", true); +  FileSpec temp_file("/usr/lib" LLDB_LIBDIR_SUFFIX "/lldb/plugins"); +  FileSystem::Instance().Resolve(temp_file);    file_spec.GetDirectory().SetCString(temp_file.GetPath().c_str());    return true;  }  | 
