[compiler-rt] r194696 - [ASan] Introduce a top-level target to collect all ASan runtimes and deps

[Rafael Espíndola]

Looks like this was just hitting a cmake bug. Dmitri fixed this
particular issue in the bot.

On 15 November 2013 10:51, Alexey Samsonov <samsonov at google.com> wrote:
> Have no idea :(
>
> r194801 and  r194802 touched some relevant code, but they were submitted
> afterwards. Maybe cleaning CMakeCache.txt will help?
>
>
> On Fri, Nov 15, 2013 at 7:30 PM, Rafael Espíndola
> <rafael.espindola at gmail.com> wrote:
>>
>> Could this be responsible for
>>
>>
>> http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-debian-fast/builds/9434/steps/cmake-configure/logs/stdio
>>
>> ?
>>
>> cmake is working for me, but this was the last change to the file the
>> bot is complaining about.
>>
>>
>> On 14 November 2013 07:24, Alexey Samsonov <samsonov at google.com> wrote:
>> > Author: samsonov
>> > Date: Thu Nov 14 06:24:12 2013
>> > New Revision: 194696
>> >
>> > URL: http://llvm.org/viewvc/llvm-project?rev=194696&view=rev
>> > Log:
>> > [ASan] Introduce a top-level target to collect all ASan runtimes and
>> > deps
>> >
>> > Modified:
>> >     compiler-rt/trunk/lib/asan/CMakeLists.txt
>> >     compiler-rt/trunk/lib/asan/lit_tests/CMakeLists.txt
>> >     compiler-rt/trunk/lib/asan/tests/CMakeLists.txt
>> >
>> > Modified: compiler-rt/trunk/lib/asan/CMakeLists.txt
>> > URL:
>> > http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=194696&r1=194695&r2=194696&view=diff
>> >
>> > ==============================================================================
>> > --- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)
>> > +++ compiler-rt/trunk/lib/asan/CMakeLists.txt Thu Nov 14 06:24:12 2013
>> > @@ -143,6 +143,10 @@ endif()
>> >
>> >  add_compiler_rt_resource_file(asan_blacklist asan_blacklist.txt)
>> >
>> > +# All ASan runtime dependencies.
>> > +add_custom_target(asan_runtime_libraries
>> > +  DEPENDS asan_blacklist ${ASAN_RUNTIME_LIBRARIES})
>> > +
>> >  if(LLVM_INCLUDE_TESTS)
>> >    add_subdirectory(tests)
>> >  endif()
>> >
>> > Modified: compiler-rt/trunk/lib/asan/lit_tests/CMakeLists.txt
>> > URL:
>> > http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/CMakeLists.txt?rev=194696&r1=194695&r2=194696&view=diff
>> >
>> > ==============================================================================
>> > --- compiler-rt/trunk/lib/asan/lit_tests/CMakeLists.txt (original)
>> > +++ compiler-rt/trunk/lib/asan/lit_tests/CMakeLists.txt Thu Nov 14
>> > 06:24:12 2013
>> > @@ -27,8 +27,7 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
>> >    # Run ASan tests only if we're sure we may produce working binaries.
>> >    set(ASAN_TEST_DEPS
>> >      ${SANITIZER_COMMON_LIT_TEST_DEPS}
>> > -    ${ASAN_RUNTIME_LIBRARIES}
>> > -    asan_blacklist)
>> > +    asan_runtime_libraries)
>> >    set(ASAN_TEST_PARAMS
>> >      asan_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
>> >    if(LLVM_INCLUDE_TESTS)
>> >
>> > Modified: compiler-rt/trunk/lib/asan/tests/CMakeLists.txt
>> > URL:
>> > http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/CMakeLists.txt?rev=194696&r1=194695&r2=194696&view=diff
>> >
>> > ==============================================================================
>> > --- compiler-rt/trunk/lib/asan/tests/CMakeLists.txt (original)
>> > +++ compiler-rt/trunk/lib/asan/tests/CMakeLists.txt Thu Nov 14 06:24:12
>> > 2013
>> > @@ -106,7 +106,7 @@ macro(asan_compile obj_list source arch)
>> >    get_target_flags_for_arch(${arch} TARGET_CFLAGS)
>> >    clang_compile(${output_obj} ${source}
>> >                  CFLAGS ${ARGN} ${TARGET_CFLAGS}
>> > -                DEPS gtest ${ASAN_RUNTIME_LIBRARIES}
>> > +                DEPS gtest asan_runtime_libraries
>> >                             ${ASAN_UNITTEST_HEADERS}
>> >                             ${ASAN_BLACKLIST_FILE})
>> >    list(APPEND ${obj_list} ${output_obj})
>> > @@ -117,7 +117,7 @@ endmacro()
>> >  macro(add_asan_test test_suite test_name arch)
>> >    parse_arguments(TEST "OBJECTS;LINKFLAGS" "WITH_TEST_RUNTIME" ${ARGN})
>> >    get_target_flags_for_arch(${arch} TARGET_LINK_FLAGS)
>> > -  set(TEST_DEPS ${ASAN_RUNTIME_LIBRARIES} ${TEST_OBJECTS})
>> > +  set(TEST_DEPS asan_runtime_libraries ${TEST_OBJECTS})
>> >    if(TEST_WITH_TEST_RUNTIME)
>> >      list(APPEND TEST_DEPS ${ASAN_TEST_RUNTIME})
>> >      list(APPEND TEST_OBJECTS lib${ASAN_TEST_RUNTIME}.a)
>> >
>> >
>> > _______________________________________________
>> > llvm-commits mailing list
>> > llvm-commits at cs.uiuc.edu
>> > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>
>
>
> --
> Alexey Samsonov, MSK