[Libreoffice-commits] core.git: external/firebird

[Mike Kaganski (via logerrit)]

 external/firebird/ExternalProject_firebird.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 872b77f6e8997b663fd01c9df655cd35a31ce39e
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Sep 2 18:48:06 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Sep 3 05:35:06 2021 +0200

    Make sure to use debug options for firebird in debug mode
    
    Change-Id: I358bd2013387e9fb341d92764f29767d6c0c2cb8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121470
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 94a62e418124..edb3ed9eabea 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -52,6 +52,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 			$(CXXFLAGS_CXX11) \
 			$(if $(filter TRUE,$(COM_IS_CLANG)), -Wno-c++11-narrowing) \
 			$(if $(call gb_Module__symbols_enabled,firebird),$(gb_DEBUGINFO_FLAGS)) \
+			$(if $(ENABLE_DEBUG)$(ENABLE_DBGUTIL),$(if $(filter MSC,$(COM)),-Od -Z7,-Wno-error)) \
 		" \
 		&& export LDFLAGS=" \
 			$(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_LIBS), \
@@ -82,7 +83,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 							'<' 101200)), \
 					ac_cv_func_clock_gettime=no)) \
 		&& LC_ALL=C $(MAKE) \
-			$(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if $(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+			$(if $(ENABLE_DEBUG)$(ENABLE_DBGUTIL),Debug) SHELL='$(SHELL)' $(if $(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
 			MATHLIB="$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(call gb_UnpackedTarball_get_dir,libtommath) -ltommath)" \
 			LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
 		$(if $(filter MACOSX,$(OS)), \