From d96e0c5388c56727840b06f6e12ec99ae71e712f Mon Sep 17 00:00:00 2001 From: Leonard Chan Date: Wed, 8 Sep 2021 18:31:10 -0700 Subject: [PATCH] Revert "[runtimes] Set more paths when building runtimes standalone" This reverts commit 407e07aa67ab56c92cdec1fdbf6b121afbceddaf. Reverting since this seems to break OpenMP builds and our clang builders. See thread on https://reviews.llvm.org/D107895. --- libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake | 2 -- runtimes/CMakeLists.txt | 6 ------ 2 files changed, 8 deletions(-) diff --git a/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake b/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake index deaa2c3805f2..ad2820b324d7 100644 --- a/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake +++ b/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake @@ -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}") diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index 418da857ea08..1ffce323d951 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -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})