From 8da8426fb413999830d98cd43b0089dbdcacb739 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Thu, 21 Nov 2013 01:23:44 +0100 Subject: [PATCH] Revert "fix flags for c++, sometimes lstdc++ link is not implicit" This reverts commit fb77c22c9319b16443e3035d885b9b87643a3ed7. --- buildtools/Cmake/Flags.cmake | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake index 8e3176dde1..24c7c97673 100644 --- a/buildtools/Cmake/Flags.cmake +++ b/buildtools/Cmake/Flags.cmake @@ -2,8 +2,8 @@ set(warnCFLAGS "") set(optCFLAGS "") if(NOT __VISUALC__ AND NOT __BORLANDC__) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-g3") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-g3") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g") else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi") @@ -97,11 +97,6 @@ if(NOT $ENV{LDFLAGS} STREQUAL "") set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} $ENV{LDFLAGS}") endif() -if(NOT $ENV{LDFLAGS} STREQUAL "") - message(STATUS "Add LDFLAGS: \"$ENV{LDFLAGS}\" to CMAKE_CXX_LINK_FLAGS") - set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} $ENV{LDFLAGS} -lstdc++") -endif() - if(enable_model-checking AND enable_compile_optimizations) message(WARNING "Sorry for now GCC optimizations does not work with model checking.\nPlease turn off optimizations with command:\ncmake -Denable_compile_optimizations=off .") endif() -- 2.20.1