From 2a567835d1a77150634800247c864f12ca836f2b Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <vonosmas@gmail.com>
Date: Fri, 19 Jun 2015 01:34:06 +0000
Subject: [PATCH] Revert "Revert "[CMake] LSan is not actually available on
 Darwin.""

Re-land fixed version of r239955.

llvm-svn: 240108
---
 compiler-rt/cmake/config-ix.cmake    |  2 +-
 compiler-rt/lib/lsan/CMakeLists.txt  |  2 +-
 compiler-rt/test/lsan/CMakeLists.txt | 18 ++++++++----------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
index bfc8497c4d8a..b6fe8ffb08c0 100644
--- a/compiler-rt/cmake/config-ix.cmake
+++ b/compiler-rt/cmake/config-ix.cmake
@@ -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)
diff --git a/compiler-rt/lib/lsan/CMakeLists.txt b/compiler-rt/lib/lsan/CMakeLists.txt
index d87e9ddb8a26..95a84439b219 100644
--- a/compiler-rt/lib/lsan/CMakeLists.txt
+++ b/compiler-rt/lib/lsan/CMakeLists.txt
@@ -24,7 +24,7 @@ add_compiler_rt_object_libraries(RTLSanCommon
     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}
diff --git a/compiler-rt/test/lsan/CMakeLists.txt b/compiler-rt/test/lsan/CMakeLists.txt
index 7f49b0d3983d..6cca00a90b6b 100644
--- a/compiler-rt/test/lsan/CMakeLists.txt
+++ b/compiler-rt/test/lsan/CMakeLists.txt
@@ -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")