[Libreoffice-commits] core.git: connectivity/Library_hsqldb.mk connectivity/Library_mysql.mk dbaccess/Library_sdbt.mk extensions/Library_bib.mk extensions/Library_dbp.mk reportdesign/Library_rpt.mk reportdesign/Library_rptui.mk reportdesign/Library_rptxml.mk solenv/gbuild svtools/Executable_g2g.mk svx/Executable_gengal.bin.mk
Peter Foley
pefoley2 at verizon.net
Mon Mar 4 14:59:10 PST 2013
connectivity/Library_hsqldb.mk | 1 +
connectivity/Library_mysql.mk | 1 +
dbaccess/Library_sdbt.mk | 1 +
extensions/Library_bib.mk | 1 +
extensions/Library_dbp.mk | 1 +
reportdesign/Library_rpt.mk | 1 +
reportdesign/Library_rptui.mk | 1 +
reportdesign/Library_rptxml.mk | 3 ++-
solenv/gbuild/platform/com_GCC_class.mk | 5 +++--
solenv/gbuild/platform/com_GCC_defs.mk | 2 +-
solenv/gbuild/platform/com_MSC_class.mk | 4 ++--
solenv/gbuild/platform/com_MSC_defs.mk | 2 +-
solenv/gbuild/platform/unxgcc.mk | 13 ++++++-------
svtools/Executable_g2g.mk | 1 +
svx/Executable_gengal.bin.mk | 3 +++
15 files changed, 26 insertions(+), 14 deletions(-)
New commits:
commit b00254ab2af5115b1a4deaaf7593d287925ebc64
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Mar 3 14:36:34 2013 -0500
make lto work
Change-Id: Iab6892368c6ba6bb5b83132cdcd6aa959c3b0e1f
diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk
index 3c26517..7c0fe61 100644
--- a/connectivity/Library_hsqldb.mk
+++ b/connectivity/Library_hsqldb.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\
dbtools \
jvmfwk \
sal \
+ salhelper \
tl \
utl \
i18nisolang1 \
diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk
index 9d2d095..e5f9fd11 100644
--- a/connectivity/Library_mysql.mk
+++ b/connectivity/Library_mysql.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,mysql,\
cppu \
cppuhelper \
sal \
+ salhelper \
dbtools \
comphelper \
$(gb_UWINAPI) \
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 2ff4dd0..50e4453 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,sdbt,\
cppuhelper \
dbtools \
sal \
+ salhelper \
tl \
utl \
$(gb_UWINAPI) \
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index 599dbdc..6de36bc 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_Library_use_libraries,bib,\
cppuhelper \
cppu \
sal \
+ salhelper \
$(gb_UWINAPI) \
))
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index 25a7271..0767444 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_Library_use_libraries,dbp,\
cppuhelper \
cppu \
sal \
+ salhelper \
$(gb_UWINAPI) \
))
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index 511da92..3520536 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,rpt,\
fwe \
i18nisolang1 \
sal \
+ salhelper \
sfx \
svl \
svt \
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index 5426367..3c84db3 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,rptui,\
i18nisolang1 \
rpt \
sal \
+ salhelper \
sfx \
sot \
svl \
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index 8ab669a..64613d9 100644
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -45,7 +45,8 @@ $(eval $(call gb_Library_use_libraries,rptxml,\
editeng \
rpt \
sal \
- sax \
+ salhelper \
+ sax \
sfx \
sot \
svl \
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 4ea1a14..b51a723 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -44,6 +44,7 @@ $(call gb_Output_announce,$(2),$(true),ASM,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
$(gb_CC) \
+ $(gb_LTOFLAGS) \
$(gb_AFLAGS) \
-c $(3) \
-o $(1)) \
@@ -61,7 +62,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(COMPILER_PLUGINS),$(gb_COMPILER_PLUGINS_SETUP)) \
$(gb_CC) \
$(DEFS) \
- $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
+ $(gb_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
$(if $(COMPILER_PLUGINS),$(gb_COMPILER_PLUGINS)) \
@@ -101,7 +102,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(COMPILER_PLUGINS),$(gb_COMPILER_PLUGINS_SETUP)) \
$(gb_CXX) \
$(DEFS) \
- $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
+ $(gb_LTOFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \
$(if $(COMPILER_PLUGINS),$(gb_COMPILER_PLUGINS)) \
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 02e3acd..a691e27 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 -fno-use-linker-plugin
+gb_LTOFLAGS := -flto
endif
gb_LinkTarget_EXCEPTIONFLAGS := \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 7e00319..9e9c87c 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -51,7 +51,7 @@ $(call gb_Helper_abbreviate_dirs,\
unset INCLUDE && \
$(if $(filter YES,$(COBJECT_X64)), $(CXX_X64_BINARY), $(gb_CC)) \
$(DEFS) \
- $(if $(filter Library,$(TARGETTYPE)),$(gb_COMPILER_LTOFLAGS)) \
+ $(gb_LTOFLAGS) \
$(T_CFLAGS) $(T_CFLAGS_APPEND) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
-Fd$(PDBFILE) \
@@ -74,7 +74,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)) \
+ $(gb_LTOFLAGS) \
$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \
-Fd$(PDBFILE) \
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 1e8004f..5824a9a 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -280,7 +280,7 @@ define gb_create_deps
endef
endif
-gb_COMPILER_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
+gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
# Helper class
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 104fe7f..5009ef54 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -104,12 +104,11 @@ gb_CXXFLAGS += -Wno-deprecated-declarations
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
+ifeq ($(ENABLE_LTO),TRUE)
+ifneq ($(COM_GCC_IS_CLANG),TRUE)
+gb_LTOFLAGS += -fuse-linker-plugin $(gb_COMPILERDEFAULTOPTFLAGS)
+endif
+endif
ifneq ($(strip $(SYSBASE)),)
gb_CXXFLAGS += --sysroot=$(SYSBASE)
@@ -186,7 +185,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
- $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
+ $(gb_LTOFLAGS) \
$(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1)).$(SOVERSION)) \
$(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\
$(subst \d,$$,$(RPATH)) \
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 5b7fc07..72856b7 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Executable_use_external,g2g,boost_headers))
$(eval $(call gb_Executable_use_sdk_api,g2g))
$(eval $(call gb_Executable_use_libraries,g2g,\
+ cppuhelper \
jvmfwk \
sal \
svt \
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index e6613e5..74c8278 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -38,12 +38,15 @@ $(eval $(call gb_Executable_set_include,$(svx_GENGALBIN),\
$(eval $(call gb_Executable_use_external,$(svx_GENGALBIN),boost_headers))
$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
+ basegfx \
sal \
tl \
svl \
+ svt \
comphelper \
cppu \
cppuhelper \
+ utl \
vcl \
svxcore \
$(gb_UWINAPI) \
More information about the Libreoffice-commits
mailing list