From dbfc495a9ace0865d764dad7404633a12cda2873 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 20 Feb 2014 23:04:00 +0100 Subject: Add config option used when we try to link one huge object file. In theory, it should not be used, we use it now to mark duplicated symbols from sdi slots as weak. See idl/source/objects/types.cxx. Change-Id: I3c6fccfb96884df6b9e6eb35b8615ba4d66ca208 --- idl/source/objects/types.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'idl') diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index c7a69a9ad176..1797fa2b3409 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -1416,7 +1416,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(LIBO_MERGELIBS))" ) << endl; + rOutStm.WriteCharPtr( "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS))) || STATIC_LINKING)" ) << endl; rOutStm.WriteCharPtr( "__attribute__((__weak__))" ) << endl; rOutStm.WriteCharPtr( "#endif" ) << endl; rOutStm.WriteCharPtr( aTypeName.getStr() ).WriteCharPtr( aVarName.getStr() ) -- cgit