[compiler-rt] r240108 - Revert "Revert "[CMake] LSan is not actually available on Darwin.""

[Alexey Samsonov]

Author: samsonov
Date: Thu Jun 18 20:34:06 2015
New Revision: 240108

URL: http://llvm.org/viewvc/llvm-project?rev=240108&view=rev
Log:
Revert "Revert "[CMake] LSan is not actually available on Darwin.""

Re-land fixed version of r239955.

Modified:
    compiler-rt/trunk/cmake/config-ix.cmake
    compiler-rt/trunk/lib/lsan/CMakeLists.txt
    compiler-rt/trunk/test/lsan/CMakeLists.txt

Modified: compiler-rt/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=240108&r1=240107&r2=240108&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/config-ix.cmake (original)
+++ compiler-rt/trunk/cmake/config-ix.cmake Thu Jun 18 20:34:06 2015
@@ -295,7 +295,7 @@ else()
 endif()
 
 if (COMPILER_RT_HAS_SANITIZER_COMMON AND LSAN_SUPPORTED_ARCH AND
-    OS_NAME MATCHES "Darwin|Linux|FreeBSD")
+    OS_NAME MATCHES "Linux|FreeBSD")
   set(COMPILER_RT_HAS_LSAN TRUE)
 else()
   set(COMPILER_RT_HAS_LSAN FALSE)

Modified: compiler-rt/trunk/lib/lsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/CMakeLists.txt?rev=240108&r1=240107&r2=240108&view=diff
==============================================================================
--- compiler-rt/trunk/lib/lsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/lsan/CMakeLists.txt Thu Jun 18 20:34:06 2015
@@ -24,7 +24,7 @@ add_compiler_rt_object_libraries(RTLSanC
     SOURCES ${LSAN_COMMON_SOURCES}
     CFLAGS ${LSAN_CFLAGS})
 
-if(NOT APPLE)
+if(COMPILER_RT_HAS_LSAN)
   foreach(arch ${LSAN_SUPPORTED_ARCH})
     add_compiler_rt_runtime(clang_rt.lsan-${arch} ${arch} STATIC
       SOURCES ${LSAN_SOURCES}

Modified: compiler-rt/trunk/test/lsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lsan/CMakeLists.txt?rev=240108&r1=240107&r2=240108&view=diff
==============================================================================
--- compiler-rt/trunk/test/lsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/lsan/CMakeLists.txt Thu Jun 18 20:34:06 2015
@@ -10,14 +10,12 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig/lit.site.cfg)
 
-if(NOT APPLE AND NOT ANDROID)
-  set(LSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
-  if(NOT COMPILER_RT_STANDALONE_BUILD)
-    list(APPEND LSAN_TEST_DEPS lsan asan)
-  endif()
-  add_lit_testsuite(check-lsan "Running the LeakSanitizer tests"
-    ${CMAKE_CURRENT_BINARY_DIR}/LsanConfig
-    ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig
-    DEPENDS ${LSAN_TEST_DEPS})
-  set_target_properties(check-lsan PROPERTIES FOLDER "LSan tests")
+set(LSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
+if(NOT COMPILER_RT_STANDALONE_BUILD)
+  list(APPEND LSAN_TEST_DEPS lsan asan)
 endif()
+add_lit_testsuite(check-lsan "Running the LeakSanitizer tests"
+  ${CMAKE_CURRENT_BINARY_DIR}/LsanConfig
+  ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig
+  DEPENDS ${LSAN_TEST_DEPS})
+set_target_properties(check-lsan PROPERTIES FOLDER "LSan tests")