[lld] r293289 - Merging r293078:

[Hans Wennborg via llvm-commits]

Author: hans
Date: Fri Jan 27 09:42:27 2017
New Revision: 293289

URL: http://llvm.org/viewvc/llvm-project?rev=293289&view=rev
Log:
Merging r293078:
------------------------------------------------------------------------
r293078 | mgorny | 2017-01-25 11:33:14 -0800 (Wed, 25 Jan 2017) | 8 lines

[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/branches/release_40/   (props changed)
    lld/branches/release_40/CMakeLists.txt

Propchange: lld/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 27 09:42:27 2017
@@ -1 +1 @@
-/lld/trunk:292909
+/lld/trunk:292909,293078

Modified: lld/branches/release_40/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_40/CMakeLists.txt?rev=293289&r1=293288&r2=293289&view=diff
==============================================================================
--- lld/branches/release_40/CMakeLists.txt (original)
+++ lld/branches/release_40/CMakeLists.txt Fri Jan 27 09:42:27 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)