summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2020-01-18 14:38:59 +0100
committerLuboš Luňák <l.lunak@collabora.com>2020-01-18 16:56:25 +0100
commit52a26b146542526dc4f6bb193ffb4fd95e4f79fd (patch)
treeb017b9211cd023ccef163a2fbc34facdf7889d19 /unotools
parent4a93a7954e49b42b0e23a9ca8d962b6d4614b005 (diff)
fix unotools/source/i18n/resmgr.cxx build with PCH on Mac
When a PCH is used, those #defines come too late if they are in the source file, set them using the command line. Change-Id: I361503db7c9e51c2cf5fdcdda2861d1377b81fa5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87020 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'unotools')
-rw-r--r--unotools/Library_utl.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index cdc4b38f96ae..e36d291db0f0 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -96,7 +96,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
unotools/source/i18n/localedatawrapper \
unotools/source/i18n/nativenumberwrapper \
unotools/source/i18n/readwritemutexguard \
- unotools/source/i18n/resmgr \
unotools/source/i18n/textsearch \
unotools/source/i18n/transliterationwrapper \
unotools/source/misc/closeveto \
@@ -123,4 +122,10 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
unotools/source/ucbhelper/xtempfile \
))
+# see the source file
+$(eval $(call gb_Library_add_exception_objects,utl,\
+ unotools/source/i18n/resmgr, \
+ -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR= -D_HAS_AUTO_PTR_ETC=1 \
+))
+
# vim: set noet sw=4 ts=4: