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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/IwyuFilter_sc.yaml | 2 | ||||
| -rw-r--r-- | sc/source/ui/app/typemap.cxx | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml index 2743efdd96f2..aec7c018fdca 100644 --- a/sc/IwyuFilter_sc.yaml +++ b/sc/IwyuFilter_sc.yaml @@ -775,8 +775,6 @@ blacklist: # Needed for direct member access - ooo/vba/XSinkCaller.hpp sc/source/ui/app/typemap.cxx: - # Needed for STATIC_LINKING to be there for scslots.hxx - - config_options.h # Needed for MID* macros - mid.h - editeng/memberids.h diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index bf40d09962b7..a6a9e689d865 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_options.h> - #include <mid.h> #include <editeng/memberids.h> #include <svx/unomid.hxx> |