Kaydet (Commit) dfebe3fc authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Revert _GLIBCXX_DEBUG on Mac OS X again

It does not work, see
<http://lists.freedesktop.org/archives/libreoffice/2013-April/050321.html> "Re:
[ANN] --enable-dbgutil: everyone gets a Debug STL!"

Change-Id: I0b0c0faa03a1a03095b70454d38a1a193b42d56a
üst 4ea76186
...@@ -38,18 +38,12 @@ else ...@@ -38,18 +38,12 @@ else
cppunit_CXXFLAGS=$(CXXFLAGS) cppunit_CXXFLAGS=$(CXXFLAGS)
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX MACOSX NETBSD OPENBSD,$(OS))) ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
ifneq (,$(gb_ENABLE_DBGUTIL)) ifneq (,$(gb_ENABLE_DBGUTIL))
cppunit_CXXFLAGS+=-D_GLIBCXX_DEBUG cppunit_CXXFLAGS+=-D_GLIBCXX_DEBUG
endif endif
endif endif
ifeq ($(OS),MACOSX)
ifneq (,$(gb_ENABLE_DBGUTIL))
cppunit_CXXFLAGS+=-D_GLIBCXX_FULLY_DYNAMIC_STRING
endif
endif
ifeq ($(OS)-$(COM),WNT-GCC) ifeq ($(OS)-$(COM),WNT-GCC)
cppunit_CXXFLAGS+=-mthreads cppunit_CXXFLAGS+=-mthreads
endif endif
......
...@@ -57,18 +57,12 @@ endif ...@@ -57,18 +57,12 @@ endif
# library (glibc), the NDK does offer the GNU C++ library as one of # library (glibc), the NDK does offer the GNU C++ library as one of
# the C++ libraries available, and we use it. # the C++ libraries available, and we use it.
# #
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX MACOSX NETBSD OPENBSD,$(OS))) ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
ifneq (,$(gb_ENABLE_DBGUTIL)) ifneq (,$(gb_ENABLE_DBGUTIL))
liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
endif endif
endif endif
ifeq ($(OS),MACOSX)
ifneq (,$(gb_ENABLE_DBGUTIL))
liborcus_CPPFLAGS+=-D_GLIBCXX_FULLY_DYNAMIC_STRING
endif
endif
liborcus_CXXFLAGS=$(CXXFLAGS) liborcus_CXXFLAGS=$(CXXFLAGS)
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS) liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
......
...@@ -77,18 +77,6 @@ gb_COMPILERDEFS += \ ...@@ -77,18 +77,6 @@ gb_COMPILERDEFS += \
endif endif
# Enable debug libstdc++
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
gb_COMPILERDEFS += \
-D_GLIBCXX_DEBUG \
# See http://lists.apple.com/archives/cocoa-dev/2009/Sep/msg01199.html ,
# http://stackoverflow.com/questions/2234557/c-using-getline-prints-pointer-being-freed-was-not-allocated-in-xcode
gb_COMPILERDEFS += \
-D_GLIBCXX_FULLY_DYNAMIC_STRING \
endif
ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE) ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE)
gb_CXXFLAGS += -Wno-long-double gb_CXXFLAGS += -Wno-long-double
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment