From 877648b703d2d392f50af134b9dc40c6753d3d54 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 18 Mar 2014 23:12:32 +0100 Subject: [PATCH 1/1] Always link with libstdc++ when not compiling with Clang on FreeBSD >= 10.0. --- buildtools/Cmake/MakeLib.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake index 77ac392734..bbf9eab654 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}) -- 2.20.1