[compiler-rt] r210232 - [Deadlock detector] Fix CMake build rules for shared runtime

Alexey Samsonov vonosmas at gmail.com
Wed Jun 4 17:58:29 PDT 2014


Author: samsonov
Date: Wed Jun  4 19:58:28 2014
New Revision: 210232

URL: http://llvm.org/viewvc/llvm-project?rev=210232&view=rev
Log:
[Deadlock detector] Fix CMake build rules for shared runtime

Modified:
    compiler-rt/trunk/lib/tsan/dd/CMakeLists.txt

Modified: compiler-rt/trunk/lib/tsan/dd/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/dd/CMakeLists.txt?rev=210232&r1=210231&r2=210232&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/dd/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/tsan/dd/CMakeLists.txt Wed Jun  4 19:58:28 2014
@@ -34,18 +34,15 @@ if(CAN_TARGET_x86_64 AND UNIX AND NOT AP
     CFLAGS ${DD_CFLAGS}
     DEFS ${DD_COMMON_DEFINITIONS})
 
-  add_library(RTDD OBJECT ${DD_SOURCES})
-  set_target_compile_flags(RTDD ${DD_CFLAGS})
-  set_property(TARGET RTDD APPEND PROPERTY
-    COMPILE_DEFINITIONS ${DD_COMMON_DEFINITIONS})
-  set_property(TARGET RTDD APPEND PROPERTY
-    COMPILE_DEFINITIONS ${DD_DYNAMIC_DEFINITIONS})
+  add_compiler_rt_object_library(RTDD ${arch}
+    SOURCES ${DD_SOURCES} CFLAGS ${DD_CFLAGS}
+    DEFS ${DD_COMMON_DEFINITIONS} ${DD_DYNAMIC_DEFINITIONS})
 
-  add_library(clang_rt.dyndd-${arch} SHARED
-    $<TARGET_OBJECTS:RTDD>
-    $<TARGET_OBJECTS:RTInterception.${arch}>
-    $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
-    $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>)
+  add_compiler_rt_runtime(clang_rt.dyndd-${arch} ${arch} SHARED
+    SOURCES $<TARGET_OBJECTS:RTDD.${arch}>
+            $<TARGET_OBJECTS:RTInterception.${arch}>
+            $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
+            $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>)
   target_link_libraries(clang_rt.dyndd-${arch} pthread dl)
 endif()
 





More information about the llvm-commits mailing list