diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2014-12-10 02:14:15 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2014-12-10 02:14:15 +0000 |
| commit | fc012497d1404989fb4b4afc82b2a4f00d6b0bca (patch) | |
| tree | 45365f6ea366b98bc99198885cf250d16f4c4b3d /lib/tsan/dd | |
| parent | 1cb0340832144a59d7ab849f1f4fffee22e39d90 (diff) | |
[CMake] Make sure dd is built as a part of compiler-rt.
Remove unused variables and definitions in CMake files
for TSan and DD (deadlock detector).
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@223908 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/tsan/dd')
| -rw-r--r-- | lib/tsan/dd/CMakeLists.txt | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/lib/tsan/dd/CMakeLists.txt b/lib/tsan/dd/CMakeLists.txt index aa7d63d38..981c1fb0b 100644 --- a/lib/tsan/dd/CMakeLists.txt +++ b/lib/tsan/dd/CMakeLists.txt @@ -5,23 +5,11 @@ include_directories(../..) set(DD_CFLAGS ${SANITIZER_COMMON_CFLAGS}) append_no_rtti_flag(DD_CFLAGS) -if("${CMAKE_BUILD_TYPE}" EQUAL "Release") - set(DD_COMMON_DEFINITIONS DEBUG=0) -else() - set(DD_COMMON_DEFINITIONS DEBUG=1) -endif() - -set(DD_DYNAMIC_DEFINITIONS DYNAMIC=1) - set(DD_SOURCES dd_rtl.cc dd_interceptors.cc ) -set(DD_HEADERS - dd_rtl.h -) - set(DD_LINKLIBS) append_list_if(COMPILER_RT_HAS_LIBDL dl DD_LINKLIBS) append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread DD_LINKLIBS) @@ -35,12 +23,11 @@ if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE AND NOT ANDROID) $<TARGET_OBJECTS:RTInterception.${arch}> $<TARGET_OBJECTS:RTSanitizerCommon.${arch}> $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}> - CFLAGS ${DD_CFLAGS} - DEFS ${DD_COMMON_DEFINITIONS}) + CFLAGS ${DD_CFLAGS}) + add_dependencies(dd clang_rt.dd-${arch}) add_compiler_rt_object_library(RTDD ${arch} - SOURCES ${DD_SOURCES} CFLAGS ${DD_CFLAGS} - DEFS ${DD_COMMON_DEFINITIONS} ${DD_DYNAMIC_DEFINITIONS}) + SOURCES ${DD_SOURCES} CFLAGS ${DD_CFLAGS}) add_compiler_rt_runtime(clang_rt.dyndd-${arch} ${arch} SHARED SOURCES $<TARGET_OBJECTS:RTDD.${arch}> @@ -48,7 +35,7 @@ if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE AND NOT ANDROID) $<TARGET_OBJECTS:RTSanitizerCommon.${arch}> $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>) target_link_libraries(clang_rt.dyndd-${arch} ${DD_LINKLIBS}) + add_dependencies(dd clang_rt.dyndd-${arch}) endif() add_dependencies(compiler-rt dd) - |