Skip to content

Commit 5659638

Browse files
committed
Revert "[compiler-rt][cmake] Use HandleOutOfTreeLLVM like libcxx and friends"
This reverts commit 8c9f62e, 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
1 parent 23a7bb5 commit 5659638

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

compiler-rt/CMakeLists.txt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55

66
cmake_minimum_required(VERSION 3.13.4)
77

8+
# Check if compiler-rt is built as a standalone project.
9+
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD)
10+
project(CompilerRT C CXX ASM)
11+
set(COMPILER_RT_STANDALONE_BUILD TRUE)
12+
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
13+
endif()
14+
815
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
916

1017
# Add path for custom compiler-rt modules.
@@ -15,16 +22,6 @@ list(INSERT CMAKE_MODULE_PATH 0
1522
"${LLVM_COMMON_CMAKE_UTILS}/Modules"
1623
)
1724

18-
# Check if compiler-rt is built as a standalone project.
19-
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD)
20-
project(CompilerRT C CXX ASM)
21-
set(COMPILER_RT_STANDALONE_BUILD TRUE)
22-
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
23-
24-
# Find the LLVM sources and simulate LLVM CMake options.
25-
include(HandleOutOfTreeLLVM)
26-
endif()
27-
2825
if(CMAKE_CONFIGURATION_TYPES)
2926
set(CMAKE_CFG_RESOLVED_INTDIR "${CMAKE_CFG_INTDIR}/")
3027
else()

0 commit comments

Comments
 (0)