[Lldb-commits] [lldb] r228716 - Failsafe directory for shared objects and support executables.
Chaoren Lin
chaorenl at google.com
Tue Feb 10 10:30:34 PST 2015
Author: chaoren
Date: Tue Feb 10 12:30:34 2015
New Revision: 228716
URL: http://llvm.org/viewvc/llvm-project?rev=228716&view=rev
Log:
Failsafe directory for shared objects and support executables.
Modified:
lldb/trunk/include/lldb/Host/linux/HostInfoLinux.h
lldb/trunk/source/Host/linux/HostInfoLinux.cpp
Modified: lldb/trunk/include/lldb/Host/linux/HostInfoLinux.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/linux/HostInfoLinux.h?rev=228716&r1=228715&r2=228716&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/linux/HostInfoLinux.h (original)
+++ lldb/trunk/include/lldb/Host/linux/HostInfoLinux.h Tue Feb 10 12:30:34 2015
@@ -40,6 +40,7 @@ class HostInfoLinux : public HostInfoPos
static FileSpec GetProgramFileSpec();
protected:
+ static bool ComputeSharedLibraryDirectory(FileSpec &file_spec);
static bool ComputeSystemPluginsDirectory(FileSpec &file_spec);
static bool ComputeUserPluginsDirectory(FileSpec &file_spec);
static void ComputeHostArchitectureSupport(ArchSpec &arch_32, ArchSpec &arch_64);
Modified: lldb/trunk/source/Host/linux/HostInfoLinux.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/linux/HostInfoLinux.cpp?rev=228716&r1=228715&r2=228716&view=diff
==============================================================================
--- lldb/trunk/source/Host/linux/HostInfoLinux.cpp (original)
+++ lldb/trunk/source/Host/linux/HostInfoLinux.cpp Tue Feb 10 12:30:34 2015
@@ -223,6 +223,15 @@ HostInfoLinux::GetProgramFileSpec()
}
bool
+HostInfoLinux::ComputeSharedLibraryDirectory(FileSpec &file_spec)
+{
+ if (HostInfoPosix::ComputeSharedLibraryDirectory(file_spec))
+ return true;
+ file_spec.GetDirectory() = GetProgramFileSpec().GetDirectory();
+ return (bool)file_spec.GetDirectory();
+}
+
+bool
HostInfoLinux::ComputeSystemPluginsDirectory(FileSpec &file_spec)
{
FileSpec temp_file("/usr/lib/lldb", true);
More information about the lldb-commits
mailing list