[Libreoffice-commits] core.git: liborcus/ExternalProject_liborcus.mk

[Tor Lillqvist]

 liborcus/ExternalProject_liborcus.mk |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 935ccf0fb5b164dcf86b306b570a04530b962314
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Apr 15 22:52:36 2013 +0300

    Use -D_GLIBCXX_DEBUG for iOS, too
    
    Also, for clarity, sort the list of platforms for which it is needed
    (those where we use the GNU C++ library).
    
    Change-Id: I55463f248ee08f97c085610d72fa688657ba36e6

diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 47e5cf5..4ad026b 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -50,7 +50,14 @@ endif
 ifeq ($(SYSTEM_ZLIB),NO)
 liborcus_CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib
 endif
-ifneq (,$(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID MACOSX,$(OS)))
+#
+# OSes that use the GNU C++ library need to use -D_GLIBCXX_DEBUG in
+# sync with the rest of LibreOffice, i.e. depending on
+# --enable-dbgutil. Note that although Android doesn't use the GNU C
+# library (glibc), the NDK does offer the GNU C++ library as one of
+# the C++ libraries available, and we use it.
+#
+ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX MACOSX NETBSD OPENBSD,$(OS)))
 ifneq (,$(gb_ENABLE_DBGUTIL))
 liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif