[Libreoffice-commits] core.git: extensions/Executable_twain32shim.mk include/oox shell/Library_spsupp_x86.mk

[Noel Grandin (via logerrit)]

 extensions/Executable_twain32shim.mk |   10 ++++++++++
 include/oox/token/tokenmap.hxx       |    3 ++-
 shell/Library_spsupp_x86.mk          |   10 ++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 7adf79c2dd4af72e6af321336ef79914364bc882
Author:     Noel Grandin <noel at peralex.com>
AuthorDate: Thu Sep 17 14:20:19 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Sep 17 17:55:23 2020 +0200

    fix LTO+mergedlibs on windows
    
    Change-Id: I3d95d566db76e14532945b881b1847ea8c7e3153
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102946
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/extensions/Executable_twain32shim.mk b/extensions/Executable_twain32shim.mk
index 6f53ca3924ab..3ac3ce8d43ed 100644
--- a/extensions/Executable_twain32shim.mk
+++ b/extensions/Executable_twain32shim.mk
@@ -13,6 +13,16 @@ $(eval $(call gb_Executable_set_targettype_gui,twain32shim,YES))
 
 $(eval $(call gb_Executable_set_x86,twain32shim,YES))
 
+# when building with link-time optimisation on, we need to turn it off for the helper
+ifeq ($(ENABLE_LTO),TRUE)
+$(eval $(call gb_Executable_add_cxxflags,twain32shim,\
+	-GL- \
+))
+$(eval $(call gb_Executable_add_ldflags,twain32shim,\
+	-LTCG:OFF \
+))
+endif
+
 $(eval $(call gb_Executable_use_externals,twain32shim,\
     sane_headers \
 ))
diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx
index cc4705e6a046..1ab9a99758cc 100644
--- a/include/oox/token/tokenmap.hxx
+++ b/include/oox/token/tokenmap.hxx
@@ -24,6 +24,7 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <oox/token/tokens.hxx>
+#include <oox/dllapi.h>
 #include <rtl/instance.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
@@ -32,7 +33,7 @@
 namespace oox {
 
 
-class TokenMap
+class OOX_DLLPUBLIC TokenMap
 {
 public:
     explicit            TokenMap();
diff --git a/shell/Library_spsupp_x86.mk b/shell/Library_spsupp_x86.mk
index ba101b7bb4ec..17183d8b92da 100644
--- a/shell/Library_spsupp_x86.mk
+++ b/shell/Library_spsupp_x86.mk
@@ -11,6 +11,16 @@ $(eval $(call gb_Library_Library,spsupp_x86))
 
 $(eval $(call gb_Library_set_x86,spsupp_x86,YES))
 
+# when building with link-time optimisation on, we need to turn it off for the helper
+ifeq ($(ENABLE_LTO),TRUE)
+$(eval $(call gb_Library_add_cxxflags,spsupp_x86,\
+	-GL- \
+))
+$(eval $(call gb_Library_add_ldflags,spsupp_x86,\
+	-LTCG:OFF \
+))
+endif
+
 $(eval $(call gb_Library_use_custom_headers,spsupp_x86,\
 	shell/source/win32/spsupp/idl \
 ))