[libcxxabi] r215950 - libcxxabi must link to dl if using bundled unwind

Jonathan Roelofs jonathan at codesourcery.com
Mon Aug 18 16:43:44 PDT 2014


Author: jroelofs
Date: Mon Aug 18 18:43:43 2014
New Revision: 215950

URL: http://llvm.org/viewvc/llvm-project?rev=215950&view=rev
Log:
libcxxabi must link to dl if using bundled unwind

Patch by Ismail Donmez
http://reviews.llvm.org/D4953

Modified:
    libcxxabi/trunk/cmake/config-ix.cmake
    libcxxabi/trunk/src/Unwind/CMakeLists.txt

Modified: libcxxabi/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/cmake/config-ix.cmake?rev=215950&r1=215949&r2=215950&view=diff
==============================================================================
--- libcxxabi/trunk/cmake/config-ix.cmake (original)
+++ libcxxabi/trunk/cmake/config-ix.cmake Mon Aug 18 18:43:43 2014
@@ -35,5 +35,6 @@ check_cxx_compiler_flag(/GR-
 
 # Check libraries
 check_library_exists(c printf "" LIBCXXABI_HAS_C_LIB)
+check_library_exists(dl dladdr "" LIBCXXABI_HAS_DL_LIB)
 check_library_exists(pthread pthread_once "" LIBCXXABI_HAS_PTHREAD_LIB)
 check_library_exists(gcc_eh _Unwind_GetRegionStart "" LIBCXXABI_HAS_GCC_EH_LIB)

Modified: libcxxabi/trunk/src/Unwind/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/Unwind/CMakeLists.txt?rev=215950&r1=215949&r2=215950&view=diff
==============================================================================
--- libcxxabi/trunk/src/Unwind/CMakeLists.txt (original)
+++ libcxxabi/trunk/src/Unwind/CMakeLists.txt Mon Aug 18 18:43:43 2014
@@ -59,6 +59,7 @@ include_directories("${LIBCXXABI_LIBCXX_
 # Generate library list.
 set(libraries ${LIBCXXABI_CXX_ABI_LIBRARIES})
 append_if(libraries LIBCXXABI_HAS_C_LIB c)
+append_if(libraries LIBCXXABI_HAS_DL_LIB dl)
 append_if(libraries LIBCXXABI_HAS_PTHREAD_LIB pthread)
 
 target_link_libraries(unwind ${libraries})





More information about the cfe-commits mailing list