[pkg-d-commits] [ldc] 178/211: LTO: add extra search locations for the LLVMgold.so plugin.

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.1.0
in repository ldc.

commit 56b62b2208dbbeb4fbcd9280d51ba8f581ddad67
Author: Johan Engelen <jbc.engelen at gmail.com>
Date:   Wed Nov 30 17:30:37 2016 +0100

    LTO: add extra search locations for the LLVMgold.so plugin.
---
 driver/linker.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/driver/linker.cpp b/driver/linker.cpp
index 5f7da96..477e2ef 100644
--- a/driver/linker.cpp
+++ b/driver/linker.cpp
@@ -129,9 +129,19 @@ std::string getLTOGoldPluginPath() {
     fatal();
   } else {
     std::string searchPaths[] = {
-        // The plugin packaged with LDC has a "-ldc" suffix.
-        exe_path::prependLibDir("LLVMgold-ldc.so"),
-        "/usr/local/lib/LLVMgold.so", "/usr/lib/bfd-plugins/LLVMgold.so",
+      // The plugin packaged with LDC has a "-ldc" suffix.
+      exe_path::prependLibDir("LLVMgold-ldc.so"),
+      // Perhaps the user copied the plugin to LDC's lib dir.
+      exe_path::prependLibDir("LLVMgold.so"),
+#if __LP64__
+      "/usr/local/lib64/LLVMgold.so",
+#endif
+      "/usr/local/lib/LLVMgold.so",
+#if __LP64__
+      "/usr/lib64/LLVMgold.so",
+#endif
+      "/usr/lib/LLVMgold.so",
+      "/usr/lib/bfd-plugins/LLVMgold.so",
     };
 
     // Try all searchPaths and early return upon the first path found.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git