Commit 407e07aa authored by Martin Storsjö's avatar Martin Storsjö
Browse files

[runtimes] Set more paths when building runtimes standalone 

These paths are needed when building with per-target runtime directories.

(It's possible to fix this by manually setting these when invoking
cmake, but one isn't supposed to need to do that.)

Also set LLVM_TOOLS_BINARY_DIR while touching this area (as it's
also unset in this case) even if it isn't specifically needed by the
per-target runtime configuration.

Differential Revision: https://reviews.llvm.org/D107895
parent 14850a06

libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ set(LLVM_INCLUDE_DIR ${LLVM_PATH}/include CACHE PATH "Path to llvm/include") 
set(LLVM_PATH ${LLVM_PATH} CACHE PATH "Path to LLVM source tree")

set(LLVM_MAIN_SRC_DIR ${LLVM_PATH})

set(LLVM_CMAKE_PATH "${LLVM_PATH}/cmake/modules")

set(LLVM_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})

set(LLVM_LIBRARY_OUTPUT_INTDIR "${CMAKE_CURRENT_BINARY_DIR}/lib")



if (EXISTS "${LLVM_CMAKE_PATH}")

  list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")

runtimes/CMakeLists.txt

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ if(compiler_rt_path) 
  endif()

endif()



if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)

  set(LLVM_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})

  set(LLVM_TOOLS_BINARY_DIR ${LLVM_BINARY_DIR}/bin)

  set(LLVM_LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/lib)

endif()



# Setting these variables will allow the sub-build to put their outputs into

# the library and bin directories of the top-level build.

set(LLVM_LIBRARY_OUTPUT_INTDIR ${LLVM_LIBRARY_DIR})