[llvm] fe30eb6 - [runtimes] When COMPILER_RT is enabled, consider SANITIZER prefixes

Petr Hosek via llvm-commits llvm-commits at lists.llvm.org
Wed Mar 11 14:22:30 PDT 2020


Author: Petr Hosek
Date: 2020-03-11T14:22:20-07:00
New Revision: fe30eb626854895c0702de1a4c8c2c80b619e3d4

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

LOG: [runtimes] When COMPILER_RT is enabled, consider SANITIZER prefixes

Currently we passthrough CMake variables based on project prefix,
i.e. LIBCXX_, LIBCXXABI_, LIBUNWIND_ and COMPILER_RT_. However, many
compiler-rt flags start with SANITIZER_ rather than COMPILER_RT, so
passthrough those as well.

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

Added: 
    

Modified: 
    llvm/runtimes/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index 64b5a57a4dc6..94dabb81484c 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -333,6 +333,11 @@ else() # if this is included from LLVM's CMake
     string(REPLACE "-" "_" canon_name ${projName})
     string(TOUPPER ${canon_name} canon_name)
     list(APPEND prefixes ${canon_name})
+    # Many compiler-rt options start with SANITIZER_ rather than COMPILER_RT_,
+    # so when compiler-rt is enabled, consider both.
+    if(canon_name STREQUAL "COMPILER_RT")
+      list(APPEND prefixes SANITIZER)
+    endif()
 
     string(FIND ${projName} "lib" LIB_IDX)
     if(LIB_IDX EQUAL 0)


        


More information about the llvm-commits mailing list