Author: Greg Clayton Date: 2022-07-22T13:24:26-07:00 New Revision: f959d815f4637890ebbacca379f1c38ab47e4e14
URL: https://github.com/llvm/llvm-project/commit/f959d815f4637890ebbacca379f1c38ab47e4e14 DIFF: https://github.com/llvm/llvm-project/commit/f959d815f4637890ebbacca379f1c38ab47e4e14.diff LOG: Fix buildbot breakage after https://reviews.llvm.org/D130309. Added: Modified: lldb/source/Host/linux/HostInfoLinux.cpp lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp Removed: ################################################################################ diff --git a/lldb/source/Host/linux/HostInfoLinux.cpp b/lldb/source/Host/linux/HostInfoLinux.cpp index 1ed203769bd1b..50aa03daaf17b 100644 --- a/lldb/source/Host/linux/HostInfoLinux.cpp +++ b/lldb/source/Host/linux/HostInfoLinux.cpp @@ -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; } @@ -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; } diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index e7cb154a8dea4..6558993470eee 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -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 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
