Commit d96e0c53 authored by Leonard Chan's avatar Leonard Chan
Browse files

Revert "[runtimes] Set more paths when building runtimes standalone" 

This reverts commit 407e07aa.

Reverting since this seems to break OpenMP builds and our clang
builders. See thread on https://reviews.llvm.org/D107895.
parent 9e46dd96

libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 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

+0 −6
Original line number Diff line number Diff line
@@ -58,12 +58,6 @@ 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})