Summary:
ComputeSupportExeDirectory relied on ComputeSharedLibraryDirectory which was
not always reliable. Using procfs seems to be the best way to deal with it on
Linux (since it's already done on Android, might as well merge it).
Reviewers: ovyalov
Reviewed By: ovyalov
Subscribers: lldb-commits
Differential Revision: http://reviews.llvm.org/D8511
llvm-svn: 232883
protected:
static void ComputeHostArchitectureSupport(ArchSpec &arch_32, ArchSpec &arch_64);
- static bool ComputeSupportExeDirectory(FileSpec &file_spec);
};
} // end of namespace lldb_private
static FileSpec GetProgramFileSpec();
protected:
- static bool ComputeSharedLibraryDirectory(FileSpec &file_spec);
+ static bool ComputeSupportExeDirectory(FileSpec &file_spec);
static bool ComputeSystemPluginsDirectory(FileSpec &file_spec);
static bool ComputeUserPluginsDirectory(FileSpec &file_spec);
static void ComputeHostArchitectureSupport(ArchSpec &arch_32, ArchSpec &arch_64);
}
}
-bool
-HostInfoAndroid::ComputeSupportExeDirectory(FileSpec &file_spec)
-{
- file_spec.GetDirectory() = HostInfoLinux::GetProgramFileSpec().GetDirectory();
- return (bool)file_spec.GetDirectory();
-}
-
FileSpec
HostInfoAndroid::GetDefaultShell()
{
}
bool
-HostInfoLinux::ComputeSharedLibraryDirectory(FileSpec &file_spec)
+HostInfoLinux::ComputeSupportExeDirectory(FileSpec &file_spec)
{
- if (HostInfoPosix::ComputeSharedLibraryDirectory(file_spec))
- return true;
file_spec.GetDirectory() = GetProgramFileSpec().GetDirectory();
- return (bool)file_spec.GetDirectory();
+ return static_cast<bool>(file_spec.GetDirectory());
}
bool