[Libreoffice-commits] core.git: solenv/gbuild

[Matúš Kukan]

 solenv/gbuild/platform/unxgcc.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a59565f855cb30fff56eb3d889376bfd27dc728f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Apr 17 10:43:28 2013 +0200

    workaround problems with LTO for some libraries (disable for them)
    
    Currently enabling lto fails for scfilt frm and wpftdraw which should be
    fixed and this commit reverted.
    
    Change-Id: I73b1846458dd7830425279328dd4e652269afc1a

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index a327593..0bcd366 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -185,7 +185,7 @@ $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_CXX) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(gb_LTOFLAGS) \
+		$(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call gb_Library_get_linktargetname,$(lib))),$*),$(gb_LTOFLAGS)) \
 		$(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1)).$(SOVERSION)) \
 		$(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\
 		$(subst \d,$$,$(RPATH)) \