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

[Lionel Elie Mamane]

 external/firebird/ExternalProject_firebird.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 40bab0a345305ec271baa374cab20d55eeb2661d
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Aug 17 19:30:41 2016 +0200

    firebird: gcc6 compatibility part 2
    
    Change-Id: I78ef547f4996050bffe83ab7e0e6acd046264bf8

diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 11a289b..6b3e689 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -55,6 +55,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 			) \
 			" \
 		&& export CXXFLAGS=" \
+			$(if $(shell test '$(GCC_VERSION)' -ge 600 && echo yes),-fno-sized-deallocation -fno-delete-null-pointer-checks,) \
 			$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \
 				$(BOOST_CPPFLAGS) \
 				-L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \