[Libreoffice-commits] .: configure.in set_soenv.in solenv/gbuild solenv/inc

[David Tardon]

 configure.in                     |    3 +++
 set_soenv.in                     |    1 +
 solenv/gbuild/platform/unxgcc.mk |    4 ++++
 solenv/inc/unxgcc.mk             |    3 +++
 4 files changed, 11 insertions(+)

New commits:
commit 7e5a66f20cb48f0ab86ff7e65c89bf03a76c1d7a
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jun 12 17:37:11 2011 +0200

    enable libstdc++'s debug mode with --enable-debug

diff --git a/configure.in b/configure.in
index d709f41..4485484 100755
--- a/configure.in
+++ b/configure.in
@@ -1859,13 +1859,16 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to do a debug build])
 if test -n "$enable_debug" && test "$enable_debug" != "no"; then
    ENABLE_DEBUG="TRUE"
+   ENABLE_DEBUG_STL="TRUE"
    enable_symbols="yes"
    AC_MSG_RESULT([yes])
 else
    ENABLE_DEBUG="FALSE"
+   ENABLE_DEBUG_STL="FALSE"
    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_DEBUG)
+AC_SUBST(ENABLE_DEBUG_STL)
 
 dnl Set the ENABLE_DBGUTIL variable
 dnl ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index 35f6fea..881d14f 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1516,6 +1516,7 @@ ToFile( "NO_BSYMBOLIC",      $NO_BSYMBOLIC,      "e" );
 if ("@ENABLE_DEBUG@" eq "TRUE") {
 ToFile( "debug",             "true",             "e" );
 }
+ToFile( "ENABLE_DEBUG_STL",  "@ENABLE_DEBUG_STL@", "e" );
 if ("@ENABLE_WERROR@" eq "FALSE") {
 ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE",  "e" );
 }
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index c93c6d1..4f283dc 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -120,6 +120,10 @@ ifeq ($(HAVE_CXX0X),TRUE)
 gb_CXXFLAGS += -std=c++0x -Wno-deprecated-declarations
 endif
 
+ifeq ($(ENABLE_DEBUG_STL),TRUE)
+gb_CXXFLAGS += -D_GLIBCXX_DEBUG
+endif
+
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 752de80..79d10d2 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -90,6 +90,9 @@ CFLAGSCXX+=-fvisibility-inlines-hidden
 .IF "$(HAVE_CXX0X)" == "TRUE"
 CFLAGSCXX+=-std=c++0x -Wno-deprecated-declarations
 .ENDIF # "$(HAVE_CXX0X)" == "TRUE"
+.IF "$(ENABLE_DEBUG_STL)" == "TRUE"
+CFLAGSCXX += -D_GLIBCXX_DEBUG
+.ENDIF
 
 CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
 CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch