external/firebird/ExternalProject_firebird.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6eee0843d4b354b849a21e6cb0978936d5f4dd01
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Sep 3 09:19:27 2021 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Sep 3 12:55:23 2021 +0200
No need to check DBGUTIL specially
... as discussed in comments to
https://gerrit.libreoffice.org/c/core/+/121470
Change-Id: I9be45e2157972156ab7c2aac820b69aa894cacfe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121553
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index edb3ed9eabea..4843043da3f7 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -52,7 +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)) \
+ $(if $(ENABLE_DEBUG),$(if $(filter MSC,$(COM)),-Od
-Z7)) \
" \
&& export LDFLAGS=" \
$(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_LIBS), \
@@ -83,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)$(ENABLE_DBGUTIL),Debug)
SHELL='$(SHELL)' $(if $(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11")
\
+ $(if $(ENABLE_DEBUG),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)), \
