diff options
author | Alexey Samsonov <samsonov@google.com> | 2014-02-14 14:45:13 +0000 |
---|---|---|
committer | Alexey Samsonov <samsonov@google.com> | 2014-02-14 14:45:13 +0000 |
commit | d85709a6709428e379188849d0e7ca6dd067d99f (patch) | |
tree | 6b7b15e70d38542e9fbdcffc5b04262442c7e761 /lib | |
parent | c22f806da90f00903009e2d448ace58b890ee50b (diff) |
[ASan] Rename asan_runtime_libraries to asan. Re-enable tests on Android.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@201417 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/asan/CMakeLists.txt | 17 | ||||
-rw-r--r-- | lib/asan/tests/CMakeLists.txt | 8 |
2 files changed, 11 insertions, 14 deletions
diff --git a/lib/asan/CMakeLists.txt b/lib/asan/CMakeLists.txt index 6b194079f..64239fe00 100644 --- a/lib/asan/CMakeLists.txt +++ b/lib/asan/CMakeLists.txt @@ -69,7 +69,7 @@ else() endif() # Build ASan runtimes shipped with Clang. -set(ASAN_RUNTIME_LIBRARIES) +add_custom_target(asan) if(APPLE) foreach (os ${SANITIZER_COMMON_SUPPORTED_DARWIN_OS}) # Dynamic lookup is needed because shadow scale and offset are @@ -85,7 +85,7 @@ if(APPLE) CFLAGS ${ASAN_CFLAGS} DEFS ${ASAN_COMMON_DEFINITIONS} LINKFLAGS ${ASAN_RUNTIME_LDFLAGS}) - list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan_${os}_dynamic) + add_dependencies(asan clang_rt.asan_${os}_dynamic) endforeach() elseif(ANDROID) @@ -98,7 +98,7 @@ elseif(ANDROID) set_property(TARGET clang_rt.asan-arm-android APPEND PROPERTY COMPILE_DEFINITIONS ${ASAN_COMMON_DEFINITIONS}) target_link_libraries(clang_rt.asan-arm-android dl log) - list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-arm-android) + add_dependencies(asan clang_rt.asan-arm-android) else() # Build separate libraries for each target. foreach(arch ${ASAN_SUPPORTED_ARCH}) @@ -116,10 +116,10 @@ else() SOURCES ${ASAN_RUNTIME_OBJECTS} CFLAGS ${ASAN_CFLAGS} DEFS ${ASAN_COMMON_DEFINITIONS}) - list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-${arch}) + add_dependencies(asan clang_rt.asan-${arch}) if (UNIX AND NOT ${arch} STREQUAL "i386") add_sanitizer_rt_symbols(clang_rt.asan-${arch} asan.syms.extra) - list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-${arch}-symbols) + add_dependencies(asan clang_rt.asan-${arch}-symbols) endif() if (WIN32) @@ -127,16 +127,13 @@ else() SOURCES asan_dll_thunk.cc CFLAGS ${ASAN_CFLAGS} -DASAN_DLL_THUNK DEFS ${ASAN_COMMON_DEFINITIONS}) - list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan_dll_thunk-${arch}) + add_dependencies(asan clang_rt.asan_dll_thunk-${arch}) endif() endforeach() 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}) +add_dependencies(asan asan_blacklist) if(LLVM_INCLUDE_TESTS) add_subdirectory(tests) diff --git a/lib/asan/tests/CMakeLists.txt b/lib/asan/tests/CMakeLists.txt index b0363f3e0..8c6a0af64 100644 --- a/lib/asan/tests/CMakeLists.txt +++ b/lib/asan/tests/CMakeLists.txt @@ -87,9 +87,9 @@ 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 - ${ASAN_UNITTEST_HEADERS} - ${ASAN_BLACKLIST_FILE}) + DEPS gtest asan + ${ASAN_UNITTEST_HEADERS} + ${ASAN_BLACKLIST_FILE}) list(APPEND ${obj_list} ${output_obj}) endmacro() @@ -98,7 +98,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 ${TEST_OBJECTS}) if(TEST_WITH_TEST_RUNTIME) list(APPEND TEST_DEPS ${ASAN_TEST_RUNTIME}) list(APPEND TEST_OBJECTS lib${ASAN_TEST_RUNTIME}.a) |