summaryrefslogtreecommitdiff
path: root/runtimes
diff options
context:
space:
mode:
authorChristopher Di Bella <cjdb@google.com>2022-06-25 00:17:30 +0000
committerChristopher Di Bella <cjdb@google.com>2022-06-30 23:50:24 +0000
commitef0b20d8e8db849062ee48c1cf9127e1f9c7df44 (patch)
treedbbd10426cffa5f2ab51d26594666e3b22989ac4 /runtimes
parentdd58735a1d44095f0827bd6f7624a1eb26c1054b (diff)
downloadllvm-ef0b20d8e8db849062ee48c1cf9127e1f9c7df44.tar.gz
[runtimes] adds llvm-libgcc to the list of runtimes to be sorted
llvm-libgcc is not a part of `LLVM_ALL_RUNTIMES` because llvm-libgcc is incompatible with an explicit libunwind and compiler-rt. This meant that it was being filtered out and not built. Differential Revision: https://reviews.llvm.org/D128568
Diffstat (limited to 'runtimes')
-rw-r--r--runtimes/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt
index 1b8c1c0aa1b5..9886e476dfb9 100644
--- a/runtimes/CMakeLists.txt
+++ b/runtimes/CMakeLists.txt
@@ -15,11 +15,12 @@ list(INSERT CMAKE_MODULE_PATH 0
# We order libraries to mirror roughly how they are layered, except that compiler-rt can depend
# on libc++, so we put it after.
-set(LLVM_ALL_RUNTIMES "libc;libunwind;libcxxabi;libcxx;compiler-rt;openmp")
+set(LLVM_DEFAULT_RUNTIMES "libc;libunwind;libcxxabi;libcxx;compiler-rt;openmp")
+set(LLVM_ALL_RUNTIMES "${LLVM_DEFAULT_RUNTIMES};llvm-libgcc")
set(LLVM_ENABLE_RUNTIMES "" CACHE STRING
"Semicolon-separated list of runtimes to build (${LLVM_ALL_RUNTIMES}), or \"all\".")
if(LLVM_ENABLE_RUNTIMES STREQUAL "all" )
- set(LLVM_ENABLE_RUNTIMES ${LLVM_ALL_RUNTIMES})
+ set(LLVM_ENABLE_RUNTIMES ${LLVM_DEFAULT_RUNTIMES})
endif()
include(SortSubset)
sort_subset("${LLVM_ALL_RUNTIMES}" "${LLVM_ENABLE_RUNTIMES}" LLVM_ENABLE_RUNTIMES)