<div dir="ltr">Agreed.</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jan 26, 2017 at 10:21 AM, Hans Wennborg <span dir="ltr"><<a href="mailto:hans@chromium.org" target="_blank">hans@chromium.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Rui, should we merge this to the release branch?<br>
<br>
(This was a fix for PR31745.)<br>
<br>
Cheers,<br>
Hans<br>
<div class="HOEnZb"><div class="h5"><br>
On Wed, Jan 25, 2017 at 11:33 AM, Michal Gorny via llvm-commits<br>
<<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br>
> Author: mgorny<br>
> Date: Wed Jan 25 13:33:14 2017<br>
> New Revision: 293078<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=293078&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=293078&view=rev</a><br>
> Log:<br>
> [cmake] Fix -rpath-link in stand-alone build<br>
><br>
> Set LLVM_LIBRARY_OUTPUT_INTDIR as expected by llvm_setup_rpath() macro<br>
> when doing stand-alone builds. This is required to pass correct<br>
> -rpath-link when linking shared libraries, and therefore ensure that<br>
> the linker can find dependency libraries correctly during the build.<br>
><br>
> Differential Revision: <a href="https://reviews.llvm.org/D29099" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D29099</a><br>
><br>
> Modified:<br>
>     lld/trunk/CMakeLists.txt<br>
><br>
> Modified: lld/trunk/CMakeLists.txt<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/CMakeLists.txt?rev=293078&r1=293077&r2=293078&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lld/trunk/CMakeLists.<wbr>txt?rev=293078&r1=293077&r2=<wbr>293078&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- lld/trunk/CMakeLists.txt (original)<br>
> +++ lld/trunk/CMakeLists.txt Wed Jan 25 13:33:14 2017<br>
> @@ -42,6 +42,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRE<br>
>    include_directories("${LLVM_<wbr>BINARY_DIR}/include" ${LLVM_INCLUDE_DIRS})<br>
>    link_directories(${LLVM_<wbr>LIBRARY_DIRS})<br>
><br>
> +  set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_<wbr>CFG_INTDIR}/lib${LLVM_LIBDIR_<wbr>SUFFIX})<br>
>    set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_<wbr>CFG_INTDIR}/bin)<br>
>    find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)<br>
><br>
><br>
><br>
> ______________________________<wbr>_________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div>