[PATCH] D14846: [CMake] Provide options for toggling on and off various runtime libraries.

Kuba Brecka via llvm-commits llvm-commits at lists.llvm.org
Tue Dec 1 05:49:25 PST 2015


kubabrecka added inline comments.

================
Comment at: cmake/config-ix.cmake:585
@@ -590,1 +584,3 @@
+  append_list_unique(COMPILER_RT_RUNTIMES_TO_BUILD lsan)
+  append_list_unique(COMPILER_RT_RUNTIMES_TO_BUILD ubsan)
 endif()
----------------
I think we need to add `interception` here as well.  Otherwise using `COMPILER_RT_RUNTIMES_TO_BUILD=asan` doesn't build for me.

================
Comment at: lib/lsan/CMakeLists.txt:28
@@ -28,1 +27,3 @@
+list(FIND COMPILER_RT_RUNTIMES_TO_BUILD lsan idx)
+if(idx GREATER -1)
   foreach(arch ${LSAN_SUPPORTED_ARCH})
----------------
Can we wrap this in a macro (and use it in ubsan/CMakeLists.txt as well)?

================
Comment at: lib/tsan/CMakeLists.txt:178
@@ +177,2 @@
+
+add_subdirectory(tsan/dd)
----------------
Shouldn't this be just `dd` instead of `tsan/dd`?

================
Comment at: test/ubsan/CMakeLists.txt:38
@@ -36,2 +37,3 @@
   endif()
-  if(COMPILER_RT_HAS_MSAN AND ";${MSAN_SUPPORTED_ARCH};" MATCHES ";${arch};")
+  if((";${COMPILER_RT_RUNTIMES_TO_BUILD};" MATCHES ";msan;"
+    AND ";${MSAN_SUPPORTED_ARCH};" MATCHES ";${arch};")
----------------
remove the extra paren

================
Comment at: test/ubsan/CMakeLists.txt:42
@@ -39,2 +41,3 @@
   endif()
-  if(COMPILER_RT_HAS_TSAN AND ";${TSAN_SUPPORTED_ARCH};" MATCHES ";${arch};")
+  if((";${COMPILER_RT_RUNTIMES_TO_BUILD};" MATCHES ";tsan;"
+    AND ";${TSAN_SUPPORTED_ARCH};" MATCHES ";${arch};")
----------------
same here


http://reviews.llvm.org/D14846





More information about the llvm-commits mailing list