From 5659638418808697061f59b78e2f93fc15f2d7cd Mon Sep 17 00:00:00 2001 From: David Tenty Date: Fri, 21 Jan 2022 12:20:28 -0500 Subject: [PATCH] Revert "[compiler-rt][cmake] Use HandleOutOfTreeLLVM like libcxx and friends" This reverts commit 8c9f62ea90c70d538766a81ef5980c9223b8566b, which is causing build failures on the bots because it inadvertently changes the output directory of the compiler-rt libs when built as a runtime. Differential Revision: https://reviews.llvm.org/D117815 --- compiler-rt/CMakeLists.txt | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 974e233..12946d7 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -5,6 +5,13 @@ cmake_minimum_required(VERSION 3.13.4) +# Check if compiler-rt is built as a standalone project. +if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) + set(COMPILER_RT_STANDALONE_BUILD TRUE) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) +endif() + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") # Add path for custom compiler-rt modules. @@ -15,16 +22,6 @@ list(INSERT CMAKE_MODULE_PATH 0 "${LLVM_COMMON_CMAKE_UTILS}/Modules" ) -# Check if compiler-rt is built as a standalone project. -if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) - project(CompilerRT C CXX ASM) - set(COMPILER_RT_STANDALONE_BUILD TRUE) - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - - # Find the LLVM sources and simulate LLVM CMake options. - include(HandleOutOfTreeLLVM) -endif() - if(CMAKE_CONFIGURATION_TYPES) set(CMAKE_CFG_RESOLVED_INTDIR "${CMAKE_CFG_INTDIR}/") else() -- 2.7.4