[lld] r293078 - [cmake] Fix -rpath-link in stand-alone build

[Hans Wennborg via llvm-commits]

Rui, should we merge this to the release branch?

(This was a fix for PR31745.)

Cheers,
Hans

On Wed, Jan 25, 2017 at 11:33 AM, Michal Gorny via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: mgorny
> Date: Wed Jan 25 13:33:14 2017
> New Revision: 293078
>
> URL: http://llvm.org/viewvc/llvm-project?rev=293078&view=rev
> Log:
> [cmake] Fix -rpath-link in stand-alone build
>
> Set LLVM_LIBRARY_OUTPUT_INTDIR as expected by llvm_setup_rpath() macro
> when doing stand-alone builds. This is required to pass correct
> -rpath-link when linking shared libraries, and therefore ensure that
> the linker can find dependency libraries correctly during the build.
>
> Differential Revision: https://reviews.llvm.org/D29099
>
> Modified:
>     lld/trunk/CMakeLists.txt
>
> Modified: lld/trunk/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/CMakeLists.txt?rev=293078&r1=293077&r2=293078&view=diff
> ==============================================================================
> --- lld/trunk/CMakeLists.txt (original)
> +++ lld/trunk/CMakeLists.txt Wed Jan 25 13:33:14 2017
> @@ -42,6 +42,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRE
>    include_directories("${LLVM_BINARY_DIR}/include" ${LLVM_INCLUDE_DIRS})
>    link_directories(${LLVM_LIBRARY_DIRS})
>
> +  set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
>    set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
>    find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits