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
This commit is contained in:
Matúš Kukan
2014-02-20 23:04:00 +01:00
parent d5951c0419
commit dbfc495a9a
10 changed files with 31 additions and 1 deletions

View File

@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_options.h>
#include "basidesh.hxx"
#include <tools/diagnose_ex.h>

View File

@@ -0,0 +1,15 @@
/*
* General configuration settings for various options.
*/
#ifndef CONFIG_OPTIONS_H
#define CONFIG_OPTIONS_H
/*
* Whether we want to link as many object files as possible into one big object.
* True in case of --enable-lto or --enable-mergelibs.
*/
#define STATIC_LINKING 0
#endif

View File

@@ -2530,6 +2530,7 @@ fi
if test -n "$enable_lto" -a "$enable_lto" != "no"; then
ENABLE_LTO="TRUE"
AC_MSG_RESULT([yes])
AC_DEFINE(STATIC_LINKING)
else
ENABLE_LTO=""
AC_MSG_RESULT([no])
@@ -12407,6 +12408,7 @@ if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then
MERGELIBS="CORE"
fi
AC_MSG_RESULT([yes])
AC_DEFINE(STATIC_LINKING)
else
AC_MSG_RESULT([no])
fi
@@ -12632,6 +12634,7 @@ AC_CONFIG_HEADERS([config_host/config_orcus.h])
AC_CONFIG_HEADERS([config_host/config_kde4.h])
AC_CONFIG_HEADERS([config_host/config_mingw.h])
AC_CONFIG_HEADERS([config_host/config_oox.h])
AC_CONFIG_HEADERS([config_host/config_options.h])
AC_CONFIG_HEADERS([config_host/config_test.h])
AC_CONFIG_HEADERS([config_host/config_telepathy.h])
AC_CONFIG_HEADERS([config_host/config_typesizes.h])

View File

@@ -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() )

View File

@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_options.h>
#include <svx/svxids.hrc>
#include "sc.hrc"
#include "scitems.hxx"

View File

@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_options.h>
#include <editeng/outliner.hxx>
#include <editeng/eeitem.hxx>

View File

@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_options.h>
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/uno/Reference.h>

View File

@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_options.h>
#include <sfx2/msg.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>

View File

@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_options.h>
#include <sfx2/objitem.hxx>
#include <sfx2/msg.hxx>
#include <svl/stritem.hxx>

View File

@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_options.h>
#include "hintids.hxx"
#include "uiitems.hxx"