[libc-commits] [libc] fe9c3c7 - [libc] _INCLUDE_SCUDO: check for compiler-rt in enabled RUNTIMES too

[Sam James via libc-commits]

Author: Alfred Persson Forsberg
Date: 2023-07-27T05:11:54+01:00
New Revision: fe9c3c786837de74dc936f8994cd5a53dd8ee708

URL: https://github.com/llvm/llvm-project/commit/fe9c3c786837de74dc936f8994cd5a53dd8ee708
DIFF: https://github.com/llvm/llvm-project/commit/fe9c3c786837de74dc936f8994cd5a53dd8ee708.diff

LOG: [libc] _INCLUDE_SCUDO: check for compiler-rt in enabled RUNTIMES too

Previously including SCUDO in a libc build with runtimes/ as root was
not possible since this code only checked for compiler-rt enabled via
LLVM_ENABLED_PROJECTS.

Reviewed By: thesamesam

Differential Revision: https://reviews.llvm.org/D156388

Added: 
    

Modified: 
    libc/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt
index 4be92ba1380c9e..0a0e0060f2a9e0 100644
--- a/libc/CMakeLists.txt
+++ b/libc/CMakeLists.txt
@@ -164,8 +164,8 @@ endif()
 
 option(LLVM_LIBC_INCLUDE_SCUDO "Include the SCUDO standalone as the allocator for LLVM libc" OFF)
 if(LLVM_LIBC_INCLUDE_SCUDO)
-  if (NOT "compiler-rt" IN_LIST LLVM_ENABLE_PROJECTS)
-    message(FATAL_ERROR "SCUDO cannot be included without adding compiler-rt to LLVM_ENABLE_PROJECTS")
+  if (NOT ("compiler-rt" IN_LIST LLVM_ENABLE_PROJECTS OR "compiler-rt" IN_LIST LLVM_ENABLE_RUNTIMES))
+    message(FATAL_ERROR "SCUDO cannot be included without adding compiler-rt to LLVM_ENABLE_PROJECTS or LLVM_ENABLE_RUNTIMES")
   endif()
 endif()