From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 24 Sep 2013 16:35:49 +0000 (+0200)
Subject: Other try to get lto working on windows
X-Git-Tag: v3_9_90~91^2~10^2~2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/967d4a8d0565585ad225e9d907fa268cb1be2e19?ds=sidebyside

Other try to get lto working on windows
---

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index d115f49566..f013a16bab 100644
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -25,9 +25,16 @@ endif()
 
 if(enable_compile_optimizations)
   set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ")
-  if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
-    set(optCFLAGS "${optCFLAGS}-flto ")
-  endif()
+  if(WIN32)
+    if (COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.7")
+    # 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 ")    
+  else()    
+    # On non-windows, 4.6 is enough for that
+    if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
+      set(optCFLAGS "${optCFLAGS} -flto ")
+    endif()
+  endif
 else()
   set(optCFLAGS "-O0 ")
 endif()
@@ -37,13 +44,6 @@ if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
   set(optCFLAGS "-O0 ")
 endif()
 
-if(WIN32) # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50293
-  if (COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.7" OR 
-      COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --disable-lto")
-  endif()
-endif()
-
 if(NOT enable_debug)
   set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
 endif()