summaryrefslogtreecommitdiff
path: root/xmlreader
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-12-23 18:41:52 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-01-02 15:33:14 +0100
commitdee53a32a9feba2021782db5762b5a9a034efae4 (patch)
tree8f627e5b574298bbe0cd9de6272b659bcbbd62a0 /xmlreader
parent8907d159378b518a769e9f8c4f67290ec588a77d (diff)
Temporary hack around cppu_detail_getCppuType variants violating ODR.
Which causes cppuhelper to pick wrong variant from other library, now that its own symbols are no longer reduced to private on Mac OS X. As a temporary hack, emit cppu_detail_getCppuType for the relevant types always as fully comprehensive; should be revisited when improving types.rdb format (routinely generating C++ information for certain UNO types into a dedicated library?). Requires a fix to xmlreader and a fix to forms that looks like a Mac OS X GCC bug.
Diffstat (limited to 'xmlreader')
-rw-r--r--xmlreader/Library_xmlreader.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk
index 24ebbc1ac94b..7e5d9b572a50 100644
--- a/xmlreader/Library_xmlreader.mk
+++ b/xmlreader/Library_xmlreader.mk
@@ -35,9 +35,11 @@ $(eval $(call gb_Library_add_defs,xmlreader,\
))
$(eval $(call gb_Library_add_linked_libs,xmlreader,\
+ cppu \
sal \
$(gb_STDLIBS) \
))
+ # cppu is only needed due to the cppumaker -C hack
$(eval $(call gb_Library_add_exception_objects,xmlreader,\
xmlreader/source/pad \