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 /idl | |
| 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 'idl')
| -rw-r--r-- | idl/source/objects/types.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 34b0e3b78847..9cb1684caffc 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -251,7 +251,7 @@ void SvMetaType::WriteSfxItem( // write the implementation part rOutStm.WriteCharPtr( "#ifdef SFX_TYPEMAP" ) << endl; - rOutStm.WriteCharPtr( "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(LINUX))) || STATIC_LINKING)" ) << endl; + rOutStm.WriteCharPtr( "#if !defined(_WIN32) && (defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(LINUX)))" ) << endl; rOutStm.WriteCharPtr( "__attribute__((__weak__))" ) << endl; rOutStm.WriteCharPtr( "#endif" ) << endl; rOutStm.WriteOString( aTypeName ).WriteOString( aVarName ) |