[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - solenv/gbuild

[Matus Kukan]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 5eb068449b287d32fe73975a6313c626184414fd
Author: Matúš Kukan <matus.ku...@gmail.com>
Date:   Sun Aug 5 21:29:20 2012 +0200

    honour --enable-lto on windows too
    
    Change-Id: I78637034d9fdd4a5528fe1e9c9bc752086954526

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 8b03099..5d3116e 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -236,6 +236,8 @@ define gb_create_deps
 endef
 endif
 
+gb_COMPILER_LTOFLAGS := $(filter TRUE,$(ENABLE_LTO),-GL)
+
 # Helper class
 
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
@@ -268,6 +270,7 @@ $(call gb_Helper_abbreviate_dirs,\
        unset INCLUDE && \
        $(gb_CC) \
                $(DEFS) \
+               $(if $(filter Library,$(TARGETTYPE)),$(gb_COMPILER_LTOFLAGS)) \
                $(T_CFLAGS) \
                $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
                -Fd$(PDBFILE) \
@@ -289,6 +292,7 @@ $(call gb_Helper_abbreviate_dirs,\
        unset INCLUDE && \
        $(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), $(gb_CXX)) \
                $(DEFS) \
+               $(if $(filter Library,$(TARGETTYPE)),$(gb_COMPILER_LTOFLAGS)) \
                $(T_CXXFLAGS) \
                $(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \
                -Fd$(PDBFILE) \
@@ -379,6 +383,10 @@ gb_Library_TARGETTYPEFLAGS := \
        -DLL \
        $(gb_Windows_PE_TARGETTYPEFLAGS)
 
+ifeq ($(ENABLE_LTO),TRUE)
+gb_Library_TARGETTYPEFLAGS += -LTCG
+endif
+
 gb_Library_get_rpath :=
 
 gb_Library_SYSPRE := i

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits