Merge branch 'master' into S4U

[simgrid.git] / buildtools / Cmake / Flags.cmake

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 8072d1d..a11db3d 100644 (file)
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -35,9 +35,12 @@ if(enable_compile_optimizations)
   if(CMAKE_COMPILER_IS_GNUCC AND (NOT enable_model-checking))
     set(optCFLAGS "${optCFLAGS} -finline-functions ")
     if(WIN32)
-      if (COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.7")
+      if (COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.8")
       # On windows, we need 4.8 or higher to enable lto because of http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50293
-        set(optCFLAGS "${optCFLAGS} -flto ")
+      #
+      # We are experiencing assertion failures even with 4.8 on MinGW.
+      # Push the support forward: will see if 4.9 works when we test it.
+      set(optCFLAGS "${optCFLAGS} -flto ")
       endif()
     else()    
       # On non-windows, 4.6 is enough for that