[Host] Respect LLVM_LIBDIR_SUFFIX when looking for LLDB plugins on Linux

mgorny · mgorny · commit c061175fcde7 · 2018-01-29T18:25:06.000Z
Fix the Linux plugin lookup path to include appropriate libdir suffix for the system. To accomplish this, store the value of LLVM_LIBDIR_SUFFIX in lldb/Host/Config.h as LLDB_LIBDIR_SUFFIX, and use this variable when defining the plugin path. Differential Revision: https://reviews.llvm.org/D42317 llvm-svn: 323673
diff --git a/lldb/include/lldb/Host/Config.h.cmake b/lldb/include/lldb/Host/Config.h.cmake
@@ -14,6 +14,8 @@
 
 #cmakedefine LLDB_DISABLE_POSIX
 
+#define LLDB_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}"
+
 #cmakedefine01 HAVE_SYS_EVENT_H
 
 #cmakedefine01 HAVE_PPOLL
diff --git a/lldb/source/Host/linux/HostInfoLinux.cpp b/lldb/source/Host/linux/HostInfoLinux.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "lldb/Host/Config.h"
 #include "lldb/Host/linux/HostInfoLinux.h"
 #include "lldb/Utility/Log.h"
 
@@ -204,7 +205,7 @@ bool HostInfoLinux::ComputeSupportExeDirectory(FileSpec &file_spec) {
 }
 
 bool HostInfoLinux::ComputeSystemPluginsDirectory(FileSpec &file_spec) {
-  FileSpec temp_file("/usr/lib/lldb/plugins", true);
+  FileSpec temp_file("/usr/lib" LLDB_LIBDIR_SUFFIX "/lldb/plugins", true);
   file_spec.GetDirectory().SetCString(temp_file.GetPath().c_str());
   return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`//`
`8`	`8`	`//===----------------------------------------------------------------------===//`
`9`	`9`
	`10`	`+#include "lldb/Host/Config.h"`
`10`	`11`	`#include "lldb/Host/linux/HostInfoLinux.h"`
`11`	`12`	`#include "lldb/Utility/Log.h"`
`12`	`13`
`@@ -204,7 +205,7 @@ bool HostInfoLinux::ComputeSupportExeDirectory(FileSpec &file_spec) {`
`204`	`205`	`}`
`205`	`206`
`206`	`207`	`bool HostInfoLinux::ComputeSystemPluginsDirectory(FileSpec &file_spec) {`
`207`		`- FileSpec temp_file("/usr/lib/lldb/plugins", true);`
	`208`	`+ FileSpec temp_file("/usr/lib" LLDB_LIBDIR_SUFFIX "/lldb/plugins", true);`
`208`	`209`	`file_spec.GetDirectory().SetCString(temp_file.GetPath().c_str());`
`209`	`210`	`return true;`
`210`	`211`	`}`