<div dir="ltr">Sorry for breakage :-/ Thanks for reverting that, I'll prepare a fix tomorrow.</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jun 17, 2015 at 8:44 PM, Justin Bogner <span dir="ltr"><<a href="mailto:mail@justinbogner.com" target="_blank">mail@justinbogner.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">Alexey Samsonov <<a href="mailto:vonosmas@gmail.com">vonosmas@gmail.com</a>> writes:<br>
> Author: samsonov<br>
> Date: Wed Jun 17 17:24:44 2015<br>
> New Revision: 239955<br>
><br>
> URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D239955-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=5hiXyrRpHoSaGnCzb2QoMyLyEZRjg0CTUVhsQJfYofg&s=CnrjUKhBg0WV-nHPUqlkq7mlWUHVDvFpbUEDmT3kyKs&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=239955&view=rev</a><br>
> Log:<br>
> [CMake] LSan is not actually available on Darwin.<br>
<br>
</span>CMake fails entirely on Darwin after this change:<br>
<br>
    CMake Error at projects/compiler-rt/cmake/Modules/AddCompilerRT.cmake:58 (add_library):<br>
      Error evaluating generator expression:<br>
<br>
        $<TARGET_OBJECTS:RTInterception.x86_64><br>
<br>
      Objects of target "RTInterception.x86_64" referenced but no such target<br>
      exists.<br>
    Call Stack (most recent call first):<br>
      projects/compiler-rt/lib/lsan/CMakeLists.txt:28 (add_compiler_rt_runtime)<br>
<br>
<br>
    CMake Error: CMake can not determine linker language for target: clang_rt.lsan-x86_64<br>
<br>
Reverting seems to fix it, so I've done that to get my tree building<br>
again in r239985.<br>
<div class="HOEnZb"><div class="h5"><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:<br>
> <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_compiler-2Drt_trunk_cmake_config-2Dix.cmake-3Frev-3D239955-26r1-3D239954-26r2-3D239955-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=5hiXyrRpHoSaGnCzb2QoMyLyEZRjg0CTUVhsQJfYofg&s=0QBRoyqOA2OMByGxf8W9tm956DA4WkDzhpS4qKko2Dk&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=239955&r1=239954&r2=239955&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/cmake/config-ix.cmake (original)<br>
> +++ compiler-rt/trunk/cmake/config-ix.cmake Wed Jun 17 17:24:44 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-3D239955-26r1-3D239954-26r2-3D239955-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=5hiXyrRpHoSaGnCzb2QoMyLyEZRjg0CTUVhsQJfYofg&s=jfSZY9QfbZTs9PTFdQM87a7sJ9cWjMUGJxHpZniZ0QE&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/CMakeLists.txt?rev=239955&r1=239954&r2=239955&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/lsan/CMakeLists.txt (original)<br>
> +++ compiler-rt/trunk/lib/lsan/CMakeLists.txt Wed Jun 17 17:24:44 2015<br>
> @@ -24,17 +24,15 @@ add_compiler_rt_object_libraries(RTLSanC<br>
>      SOURCES ${LSAN_COMMON_SOURCES}<br>
>      CFLAGS ${LSAN_CFLAGS})<br>
><br>
> -if(NOT APPLE)<br>
> -  foreach(arch ${LSAN_SUPPORTED_ARCH})<br>
> -    add_compiler_rt_runtime(clang_rt.lsan-${arch} ${arch} STATIC<br>
> -      SOURCES ${LSAN_SOURCES}<br>
> -              $<TARGET_OBJECTS:RTInterception.${arch}><br>
> -              $<TARGET_OBJECTS:RTSanitizerCommon.${arch}><br>
> -              $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}><br>
> -              $<TARGET_OBJECTS:RTLSanCommon.${arch}><br>
> -      CFLAGS ${LSAN_CFLAGS})<br>
> -    add_dependencies(lsan clang_rt.lsan-${arch})<br>
> -  endforeach()<br>
> -endif()<br>
> +foreach(arch ${LSAN_SUPPORTED_ARCH})<br>
> +  add_compiler_rt_runtime(clang_rt.lsan-${arch} ${arch} STATIC<br>
> +    SOURCES ${LSAN_SOURCES}<br>
> +            $<TARGET_OBJECTS:RTInterception.${arch}><br>
> +            $<TARGET_OBJECTS:RTSanitizerCommon.${arch}><br>
> +            $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}><br>
> +            $<TARGET_OBJECTS:RTLSanCommon.${arch}><br>
> +    CFLAGS ${LSAN_CFLAGS})<br>
> +  add_dependencies(lsan clang_rt.lsan-${arch})<br>
> +endforeach()<br>
><br>
>  add_dependencies(compiler-rt lsan)<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-3D239955-26r1-3D239954-26r2-3D239955-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=5hiXyrRpHoSaGnCzb2QoMyLyEZRjg0CTUVhsQJfYofg&s=mMCVDsGLcVW5G0EFnvMy7ll4CUnMhdpWKJYhkto4t7o&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lsan/CMakeLists.txt?rev=239955&r1=239954&r2=239955&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/test/lsan/CMakeLists.txt (original)<br>
> +++ compiler-rt/trunk/test/lsan/CMakeLists.txt Wed Jun 17 17:24:44 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=5hiXyrRpHoSaGnCzb2QoMyLyEZRjg0CTUVhsQJfYofg&s=d18Fr60L8ozPUjcqvaX8iLVUMMCpSsVf6w1WKBjr3VE&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>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div>