Skip to content

Commit

Permalink
Fix buildbot breakage after https://reviews.llvm.org/D130309.
Browse files Browse the repository at this point in the history
  • Loading branch information
clayborg committed Jul 22, 2022
1 parent 0b36a62 commit f959d81
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions lldb/source/Host/linux/HostInfoLinux.cpp
Expand Up @@ -178,7 +178,7 @@ bool HostInfoLinux::ComputeSupportExeDirectory(FileSpec &file_spec) {
bool HostInfoLinux::ComputeSystemPluginsDirectory(FileSpec &file_spec) {
FileSpec temp_file("/usr/lib" LLDB_LIBDIR_SUFFIX "/lldb/plugins");
FileSystem::Instance().Resolve(temp_file);
file_spec.GetDirectory().SetCString(temp_file.GetPath().c_str());
file_spec.SetDirectory(temp_file.GetPath());
return true;
}

Expand All @@ -190,9 +190,9 @@ bool HostInfoLinux::ComputeUserPluginsDirectory(FileSpec &file_spec) {
if (xdg_data_home && xdg_data_home[0]) {
std::string user_plugin_dir(xdg_data_home);
user_plugin_dir += "/lldb";
file_spec.GetDirectory().SetCString(user_plugin_dir.c_str());
file_spec.SetDirectory(user_plugin_dir.c_str());
} else
file_spec.GetDirectory().SetCString("~/.local/share/lldb");
file_spec.SetDirectory("~/.local/share/lldb");
return true;
}

Expand Down
Expand Up @@ -241,7 +241,7 @@ void ScriptInterpreterPython::ComputePythonDir(
llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR);

#if defined(_WIN32)
// This will be injected directly through FileSpec.GetDirectory().SetString(),
// This will be injected directly through FileSpec.SetDirectory(),
// so we need to normalize manually.
std::replace(path.begin(), path.end(), '\\', '/');
#endif
Expand Down

0 comments on commit f959d81

Please sign in to comment.