[pkg-d-commits] [ldc] 167/211: Revert "Move the LTO plugin to the `bin` dir."

[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 788add6155a37ea4d9429816e23397b5a4ba2e31
Author: Johan Engelen <jbc.engelen at gmail.com>
Date:   Mon Nov 28 13:58:09 2016 +0100

    Revert "Move the LTO plugin to the `bin` dir."
    
    This reverts commit 23a677d0018f0a8cc886bdcac36a7394299a17ba.
---
 CMakeLists.txt    | 5 +++--
 driver/linker.cpp | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b541a3..06fcc1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -736,8 +736,9 @@ elseif(UNIX)
 endif()
 if(EXISTS ${LLVM_LTO_BINARY})
     message(STATUS "Also installing LTO binary: ${LLVM_LTO_BINARY}")
-    configure_file(${LLVM_LTO_BINARY} ${PROJECT_BINARY_DIR}/bin/${LDC_LTO_BINARY_NAME} COPYONLY)
-    install(PROGRAMS ${PROJECT_BINARY_DIR}/bin/${LDC_LTO_BINARY_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+    file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+    configure_file(${LLVM_LTO_BINARY} ${PROJECT_BINARY_DIR}/lib/${LDC_LTO_BINARY_NAME} COPYONLY)
+    install(PROGRAMS ${PROJECT_BINARY_DIR}/lib/${LDC_LTO_BINARY_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 endif()
 
 #
diff --git a/driver/linker.cpp b/driver/linker.cpp
index 019b1a1..0ebcc4d 100644
--- a/driver/linker.cpp
+++ b/driver/linker.cpp
@@ -130,7 +130,7 @@ std::string getLTOGoldPluginPath() {
   } else {
     std::string searchPaths[] = {
         // The plugin packaged with LDC has a "-ldc" suffix.
-        exe_path::prependBinDir("LLVMgold-ldc.so"),
+        exe_path::prependLibDir("LLVMgold-ldc.so"),
         "/usr/local/lib/LLVMgold.so", "/usr/lib/bfd-plugins/LLVMgold.so",
     };
 
@@ -181,7 +181,7 @@ std::string getLTOdylibPath() {
     fatal();
   } else {
     // The plugin packaged with LDC has a "-ldc" suffix.
-    std::string searchPath = exe_path::prependBinDir("libLTO-ldc.dylib");
+    std::string searchPath = exe_path::prependLibDir("libLTO-ldc.dylib");
     if (llvm::sys::fs::exists(searchPath))
       return searchPath;
 

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