diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-03-20 16:15:32 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-03-20 19:31:11 +0100 |
| commit | cbb42f9dd4cccd859d7dcad865c06b38e3df37b3 (patch) | |
| tree | 3ee9fcbc0bb7bf6ac8736f9c39d7fe1be7e004b4 /sfx2 | |
| parent | 81164d233eef91f5f76e79361688fbb67dc096ff (diff) | |
The idl __attribute__((__weak__)) hack doesn't seem necessary for --enable-lto
dbfc495a9ace0865d764dad7404633a12cda2873 "Add config option used when we try to
link one huge object file" had added it for the --enable-lto case, but without
documenting exactly what it should help with. And at least my local Linux
--enable-lto --enable-dbgutil etc. build successfully does `make check &&
make screenshot` without it.
This removes the only use of STATIC_LINKING, so remove it completely. (And
basctl/source/basicide/basidesh.cxx still needs to include config_options.h for
ENABLE_MERGELIBS.)
Change-Id: I3820e1cacccc92f5ac0c9c7fcc539c29a6864694
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90804
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/IwyuFilter_sfx2.yaml | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml index 16c922da30a7..e3cab84a6efc 100644 --- a/sfx2/IwyuFilter_sfx2.yaml +++ b/sfx2/IwyuFilter_sfx2.yaml @@ -74,8 +74,6 @@ blacklist: - sfx2/frame.hxx - sfx2/msg.hxx - sorgitm.hxx - # Needed for STATIC_LINKING to work - - config_options.h sfx2/source/appl/newhelp.cxx: # Actually used - com/sun/star/i18n/XBreakIterator.hpp diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index b1fd03e925b1..1dec99095687 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -18,7 +18,6 @@ */ #include <config_features.h> -#include <config_options.h> #include <sal/config.h> |