From 7eae9275b48d29fca8a07bf777259e198b5f7517 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Mon, 7 Sep 2015 22:10:54 +0200 Subject: [PATCH 1/1] [cmake] Remove the explicit linking on C++ standard library This is already handled by cmake. --- tools/cmake/MakeLib.cmake | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake index 6c018d6277..2fb2f464ee 100644 --- a/tools/cmake/MakeLib.cmake +++ b/tools/cmake/MakeLib.cmake @@ -33,27 +33,6 @@ if (HAVE_BOOST_CONTEXT) set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}") endif() -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) - # see https://wiki.freebsd.org/NewC%2B%2BStack - set(SIMGRID_DEP "${SIMGRID_DEP} -lc++") -elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" - AND ${CMAKE_SYSTEM_VERSION} VERSION_LESS 10.0 - AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") - # FreeBSD prior to 10.0 does not necessarily have a compiler - # installed that is capable of c++11! Hence, we just assume - # here that libc++ was compiled. - # FIXME: We should change this behavior; we may want to include - # an option of whether libc++ (clang++) or libstdc++ (g++) - # should be used. - include_directories( "/usr/local/include/c++/v1") - set(SIMGRID_DEP "${SIMGRID_DEP} -lc++ -L/usr/local/lib ") -else() - set(SIMGRID_DEP "${SIMGRID_DEP} -lstdc++") -endif() - if(HAVE_PTHREAD AND ${CONTEXT_THREADS} AND NOT APPLE) # Clang on recent Mac OS X is not happy about -pthread. SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread") -- 2.20.1