<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jun 18, 2015 at 6:34 PM, Alexey Samsonov <span dir="ltr"><<a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: samsonov<br>
Date: Thu Jun 18 20:34:06 2015<br>
New Revision: 240108<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D240108-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=Tml9mWWzKOf4ismJCUyPH0WeL6yveYU93YhVDL74bI4&s=iwO5KO8A3_4Rg17yB4T_dz2oAXA1QLwYp_SzMedSDHA&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=240108&view=rev</a><br>
Log:<br>
Revert "Revert "[CMake] LSan is not actually available on Darwin.""<br>
<br>
Re-land fixed version of r239955.<br></blockquote><div><br>Can be handy to mention what was broken/how it was fixed when relanding patches.<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
    compiler-rt/trunk/cmake/config-ix.cmake<br>
    compiler-rt/trunk/lib/lsan/CMakeLists.txt<br>
    compiler-rt/trunk/test/lsan/CMakeLists.txt<br>
<br>
Modified: compiler-rt/trunk/cmake/config-ix.cmake<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_cmake_config-2Dix.cmake-3Frev-3D240108-26r1-3D240107-26r2-3D240108-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=Tml9mWWzKOf4ismJCUyPH0WeL6yveYU93YhVDL74bI4&s=p9Uzo-l8K5ZZElZ2d_x0PxqUYOKBHZKtJhuX6AQibbs&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=240108&r1=240107&r2=240108&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/cmake/config-ix.cmake (original)<br>
+++ compiler-rt/trunk/cmake/config-ix.cmake Thu Jun 18 20:34:06 2015<br>
@@ -295,7 +295,7 @@ else()<br>
 endif()<br>
<br>
 if (COMPILER_RT_HAS_SANITIZER_COMMON AND LSAN_SUPPORTED_ARCH AND<br>
-    OS_NAME MATCHES "Darwin|Linux|FreeBSD")<br>
+    OS_NAME MATCHES "Linux|FreeBSD")<br>
   set(COMPILER_RT_HAS_LSAN TRUE)<br>
 else()<br>
   set(COMPILER_RT_HAS_LSAN FALSE)<br>
<br>
Modified: compiler-rt/trunk/lib/lsan/CMakeLists.txt<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_lib_lsan_CMakeLists.txt-3Frev-3D240108-26r1-3D240107-26r2-3D240108-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=Tml9mWWzKOf4ismJCUyPH0WeL6yveYU93YhVDL74bI4&s=deOxiDJR_MSRWYPCH93cZvhmkdGuhcuBjx3GizyJTEg&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/CMakeLists.txt?rev=240108&r1=240107&r2=240108&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/lsan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/lsan/CMakeLists.txt Thu Jun 18 20:34:06 2015<br>
@@ -24,7 +24,7 @@ add_compiler_rt_object_libraries(RTLSanC<br>
     SOURCES ${LSAN_COMMON_SOURCES}<br>
     CFLAGS ${LSAN_CFLAGS})<br>
<br>
-if(NOT APPLE)<br>
+if(COMPILER_RT_HAS_LSAN)<br>
   foreach(arch ${LSAN_SUPPORTED_ARCH})<br>
     add_compiler_rt_runtime(clang_rt.lsan-${arch} ${arch} STATIC<br>
       SOURCES ${LSAN_SOURCES}<br>
<br>
Modified: compiler-rt/trunk/test/lsan/CMakeLists.txt<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_test_lsan_CMakeLists.txt-3Frev-3D240108-26r1-3D240107-26r2-3D240108-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=Tml9mWWzKOf4ismJCUyPH0WeL6yveYU93YhVDL74bI4&s=tDSymgHwbYOHkDidY4XrmXbVV9vSeo1R6woZbBBCkj4&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lsan/CMakeLists.txt?rev=240108&r1=240107&r2=240108&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/lsan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/test/lsan/CMakeLists.txt Thu Jun 18 20:34:06 2015<br>
@@ -10,14 +10,12 @@ configure_lit_site_cfg(<br>
   ${CMAKE_CURRENT_SOURCE_DIR}/<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__lit.site.cfg.in&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=Tml9mWWzKOf4ismJCUyPH0WeL6yveYU93YhVDL74bI4&s=pKA46KyuZ5ufkWKpT-wBhlAy2mVR6fwFa_nDekl_qxQ&e=" rel="noreferrer" target="_blank">lit.site.cfg.in</a><br>
   ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig/lit.site.cfg)<br>
<br>
-if(NOT APPLE AND NOT ANDROID)<br>
-  set(LSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})<br>
-  if(NOT COMPILER_RT_STANDALONE_BUILD)<br>
-    list(APPEND LSAN_TEST_DEPS lsan asan)<br>
-  endif()<br>
-  add_lit_testsuite(check-lsan "Running the LeakSanitizer tests"<br>
-    ${CMAKE_CURRENT_BINARY_DIR}/LsanConfig<br>
-    ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig<br>
-    DEPENDS ${LSAN_TEST_DEPS})<br>
-  set_target_properties(check-lsan PROPERTIES FOLDER "LSan tests")<br>
+set(LSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})<br>
+if(NOT COMPILER_RT_STANDALONE_BUILD)<br>
+  list(APPEND LSAN_TEST_DEPS lsan asan)<br>
 endif()<br>
+add_lit_testsuite(check-lsan "Running the LeakSanitizer tests"<br>
+  ${CMAKE_CURRENT_BINARY_DIR}/LsanConfig<br>
+  ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig<br>
+  DEPENDS ${LSAN_TEST_DEPS})<br>
+set_target_properties(check-lsan PROPERTIES FOLDER "LSan tests")<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>