Do not link the dyndd runtime library against libdl on FreeBSD

[emaste]

lib/tsan/dd/CMakeLists.txt

27

There are a couple of examples of optionally adding -ldl without relying on the system name, in other llvm projects:

lib/Support/CMakeLists.txt:

if( HAVE_LIBDL )
  set(system_libs ${system_libs} ${CMAKE_DL_LIBS})

projects/libcxxabi/src/Unwind/CMakeLists.txt:

append_if(libraries LIBCXXABI_HAS_DL_LIB dl)

[samsonov]

lib/tsan/dd/CMakeLists.txt

27

Yeah, you should use

append_if(COMPILER_RT_HAS_LIBDL dl DD_LINKLIBS)

we already have COMPILER_RT_HAS_LIBDL defined. Also, while you're here, use COMPILER_RT_HAS_LIBPTHREAD for pthread as well.

[kutuzov.viktor.84]

Updated.

[samsonov]

LGTM

Closed by commit rL217944 (authored by vkutuzov).

lib/tsan/dd/CMakeLists.txt

set(DD_SOURCES
   dd_rtl.cc
   dd_interceptors.cc
 )
 
 set(DD_HEADERS
   dd_rtl.h
 )
 
+set(DD_LINKLIBS)
+append_if(COMPILER_RT_HAS_LIBDL dl DD_LINKLIBS)
+append_if(COMPILER_RT_HAS_LIBPTHREAD pthread DD_LINKLIBS)
+
 add_custom_target(dd)
 # Deadlock detector is currently supported on 64-bit Linux only.
 if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE AND NOT ANDROID)
   set(arch "x86_64")
   add_compiler_rt_runtime(clang_rt.dd-${arch} ${arch} STATIC
     SOURCES ${DD_SOURCES}
             $<TARGET_OBJECTS:RTInterception.${arch}>
             $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
             $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
     CFLAGS ${DD_CFLAGS}
     DEFS ${DD_COMMON_DEFINITIONS})
 
   add_compiler_rt_object_library(RTDD ${arch}
     SOURCES ${DD_SOURCES} CFLAGS ${DD_CFLAGS}
     DEFS ${DD_COMMON_DEFINITIONS} ${DD_DYNAMIC_DEFINITIONS})
 
   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)
+  target_link_libraries(clang_rt.dyndd-${arch} ${DD_LINKLIBS})
 endif()
 
 add_dependencies(compiler-rt dd)