[CMake]Use LLVM_LIBRARY_DIR for lib path.

[aoli]

Summary

This makes sure the correct lib path is being used when CMAKE_CFG_INTDIR or
LLVM_LIBDIR_SUFFIX is set.

[aoli]

Use LLVM_LIBRARY_OUTPUT_INTDIR

[aoli]

revert back to use LLVM_LIBRARY_DIR.

[phosek]

runtimes/CMakeLists.txt

333 ↗

(On Diff #106461)

You also need to set the LLVM_LIBRARY_DIR here. I'd like to eventually deduplicate the cross-target and single-target cases to avoid do changes like these in two places.

[aoli]

Pass LLVM_LIBRARY_DIR to external projects.

[phosek]

LGTM

llvm/trunk/runtimes/CMakeLists.txt

if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
 
   cmake_minimum_required(VERSION 3.4.3)
 
   # Add the root project's CMake modules, and the LLVM build's modules to the
   # CMake module path.
   list(INSERT CMAKE_MODULE_PATH 0
     "${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
     "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules"
-    "${LLVM_BINARY_DIR}/lib/cmake/llvm"
+    "${LLVM_LIBRARY_DIR}/cmake/llvm"
   )
 
   # Some of the runtimes will conditionally use the compiler-rt sanitizers
   # to make this work smoothly we ensure that compiler-rt is added first in
   # the list of sub-projects. This allows other sub-projects to have checks
   # like `if(TARGET asan)` to enable building with asan.
   foreach(entry ${runtimes})
     if("${entry}" MATCHES "compiler-rt")
foreach(entry ${runtimes})
 
     if(LLVM_RUNTIMES_TARGET)
       if(NOT "${entry}" MATCHES "compiler-rt")
         set(LLVM_BINARY_DIR "${LLVM_LIBRARY_DIR}/${LLVM_RUNTIMES_TARGET}")
         set(LLVM_LIBRARY_OUTPUT_INTDIR "${LLVM_LIBRARY_DIR}/${LLVM_RUNTIMES_TARGET}/lib")
         set(LLVM_RUNTIME_OUTPUT_INTDIR "${LLVM_TOOLS_BINARY_DIR}/${LLVM_RUNTIMES_TARGET}")
       endif()
     endif()
-    
     # Between each sub-project we want to cache and clear the LIT properties
     set_property(GLOBAL PROPERTY LLVM_LIT_TESTSUITES)
     set_property(GLOBAL PROPERTY LLVM_LIT_PARAMS)
     set_property(GLOBAL PROPERTY LLVM_LIT_DEPENDS)
     set_property(GLOBAL PROPERTY LLVM_LIT_EXTRA_ARGS)
 
     add_subdirectory(${projName})
 
if(LLVM_RUNTIMES_TARGET)
         set(LLVM_RUNTIME_OUTPUT_INTDIR "${SAFE_LLVM_RUNTIME_OUTPUT_INTDIR}")
       endif()
     endif()
   endforeach()
 
   if(LLVM_INCLUDE_TESTS)
     # Add a global check rule now that all subdirectories have been traversed
     # and we know the total set of lit testsuites.
-    
     add_lit_target(check-runtimes
       "Running all regression tests"
       ${RUNTIMES_LIT_TESTSUITES}
       PARAMS ${RUNTIMES_LIT_PARAMS}
       DEPENDS ${RUNTIMES_LIT_DEPENDS}
       ARGS ${RUNTIMES_LIT_EXTRA_ARGS}
       )
     add_custom_target(runtimes-test-depends DEPENDS ${RUNTIMES_LIT_DEPENDS})
function(runtime_register_target target)
     endif()
 
     llvm_ExternalProject_Add(runtimes-${target}
                              ${CMAKE_CURRENT_SOURCE_DIR}
                              DEPENDS ${deps}
                              # Builtins were built separately above
                              CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
                                         -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
+                                        -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
                                         -DCMAKE_C_COMPILER_TARGET=${target}
                                         -DCMAKE_CXX_COMPILER_TARGET=${target}
                                         -DCMAKE_ASM_COMPILER_TARGET=${target}
                                         -DCMAKE_C_COMPILER_WORKS=ON
                                         -DCMAKE_CXX_COMPILER_WORKS=ON
                                         -DCMAKE_ASM_COMPILER_WORKS=ON
                                         -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
                                         ${${target}_extra_args}
if(NOT LLVM_RUNTIME_TARGETS)
       endif()
 
       llvm_ExternalProject_Add(runtimes
                                ${CMAKE_CURRENT_SOURCE_DIR}
                                DEPENDS ${deps}
                                # Builtins were built separately above
                                CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
                                           -DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
+                                          -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
                                PASSTHROUGH_PREFIXES ${prefixes}
                                EXTRA_TARGETS ${extra_targets}
                                               ${test_targets}
                                               ${SUB_COMPONENTS}
                                               ${SUB_CHECK_TARGETS}
                                               ${SUB_INSTALL_TARGETS}
                                USE_TOOLCHAIN
                                ${EXTRA_ARGS})