solenv/gbuild/platform/com_GCC_defs.mk | 2 +-
solenv/gbuild/platform/unxgcc.mk | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 5b1d2fd1e6c39d44ad65c3aec1b496c7a446b1ea
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Mar 2 13:05:18 2013 -0500
more lto fixes
Change-Id: I97eb27a354dfb6b6d94886729c5b6df0b0f7687a
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 4f64bff..02e3acd 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -108,7 +108,7 @@ gb_CXXFLAGS_COMMON += -DLIBO_MERGELIBS
endif
ifeq ($(ENABLE_LTO),TRUE)
-gb_Library_LTOFLAGS := -flto
+gb_Library_LTOFLAGS := -flto -fno-use-linker-plugin
endif
gb_LinkTarget_EXCEPTIONFLAGS := \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 1b85ced..104fe7f 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -104,11 +104,12 @@ gb_CXXFLAGS += -Wno-deprecated-declarations
endif
endif
-ifeq ($(ENABLE_LTO),TRUE)
-ifneq ($(COM_GCC_IS_CLANG),TRUE)
-gb_LinkTarget_LTOFLAGS += -fuse-linker-plugin $(gb_COMPILERDEFAULTOPTFLAGS)
-endif
-endif
+# Breaks the build, needs more testing
+#ifeq ($(ENABLE_LTO),TRUE)
+#ifneq ($(COM_GCC_IS_CLANG),TRUE)
+#gb_LinkTarget_LTOFLAGS += -fuse-linker-plugin $(gb_COMPILERDEFAULTOPTFLAGS)
+#endif
+#endif
ifneq ($(strip $(SYSBASE)),)
gb_CXXFLAGS += --sysroot=$(SYSBASE)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
