diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-09-22 22:08:56 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-10-04 08:59:34 +0200 |
| commit | ba33189343a622bddb78657bbb111e5f10ba82a4 (patch) | |
| tree | 552283520b6c72ce3f55fa88809124d26b7ea58c /pch | |
| parent | 98dc4ec4957ffa520c9acb21d2477df36496a000 (diff) | |
add gbuild function for a common PCH and use it in sc/ and sax/
And make it simple to disable the whole feature by setting
gb_DISABLE_PCH_REUSE=1, just in case.
Also work around a possible BOOST_ALL_NO_LIB mismatch when
using the common PCH.
Change-Id: I96fd507edf1ada6242ac225026250e5a588d0193
Reviewed-on: https://gerrit.libreoffice.org/79365
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'pch')
| -rw-r--r-- | pch/StaticLibrary_precompiled_system.mk | 8 | ||||
| -rw-r--r-- | pch/inc/clangfix.hxx | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pch/StaticLibrary_precompiled_system.mk b/pch/StaticLibrary_precompiled_system.mk index 9cc9f0b56a1a..1812bc6aa609 100644 --- a/pch/StaticLibrary_precompiled_system.mk +++ b/pch/StaticLibrary_precompiled_system.mk @@ -17,4 +17,12 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,precompiled_system,\ pch/system_empty \ )) +# We use this to disable a weird "auto-link" feature of boost. +# Define it for the PCH, so that it's set in all cases, +# and gb_LinkTarget_reuse_precompiled_header enforces it for any uses. +$(eval $(call gb_StaticLibrary_add_defs,precompiled_system, \ + -DBOOST_ALL_NO_LIB \ +)) + + # vim: set noet sw=4 ts=4: diff --git a/pch/inc/clangfix.hxx b/pch/inc/clangfix.hxx index 9d1c131081b8..7280032baa1c 100644 --- a/pch/inc/clangfix.hxx +++ b/pch/inc/clangfix.hxx @@ -13,9 +13,11 @@ // And many of these macros are not actually used. So use them here to silence the warnings. // See gb_PrecompiledHeader_ignore_flags_system in solenv/gbuild/PrecompiledHeaders.mk . +#ifdef FASTSAX_DLLIMPLEMENTATION +#endif #ifdef SAX_DLLIMPLEMENTATION #endif -#ifdef FASTSAX_DLLIMPLEMENTATION +#ifdef SCQAHELPER_DLLIMPLEMENTATION #endif #ifdef SYSTEM_EXPAT #endif |