X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db063ce98cf35b099e237842a153524caf640118..23beefe235c8e560296fb4f3a6b8681d02be4f50:/buildtools/Cmake/MakeLib.cmake

diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index 77ac392734..ef15efa4a7 100644
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -22,14 +22,14 @@ add_dependencies(simgrid maintainer_files)
 #####################################
 set(SIMGRID_DEP "-lm")
 
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-  set(SIMGRID_DEP "${SIMGRID_DEP} -lstdc++")
-elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" 
+if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
     AND NOT ${CMAKE_SYSTEM_VERSION} VERSION_LESS 10.0
     AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
   # FreeBSD from 10.0 provide a internal C++ stack (unused by gcc)
   set(SIMGRID_DEP "${SIMGRID_DEP} -lc++")
-endif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+else()
+  set(SIMGRID_DEP "${SIMGRID_DEP} -lstdc++")
+endif()
 
 if(pthread)
   if(${CONTEXT_THREADS})
@@ -86,6 +86,9 @@ if(HAVE_MC)
   #   (that includes FindLibunwind.cmake), so simply load it now.
   
   SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind")
+
+  # Same for libdw
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -ldw")
   # This supposes that the host machine is either an AMD or a X86.
   # This is deeply wrong, and should be fixed by manually loading -lunwind-PLAT (FIXME)
   if(PROCESSOR_x86_64)