diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-18 11:48:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-18 12:52:23 +0000 |
| commit | 6782d9991c942042c9a959b57355b4bbce5cb314 (patch) | |
| tree | 4f7d6ad94612fd24d8d11943d78b8881abbce5b4 /external/firebird | |
| parent | ed815a242ef962afa52033a0d94ba6aa4539dd07 (diff) | |
external/firebird: Make GCC check work for Clang, too
Randomly approximate that HAVE_GXX_FNO_SIZED_DEALLOCATION also implies support
for -fno-delete-null-pointer-checks, and hope that approximation matches the
various versions of GCC and Clang that are relevant for us.
Change-Id: I265bf3432a852a094318a54975403eac60721ab4
Reviewed-on: https://gerrit.libreoffice.org/28211
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/firebird')
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index b30fe9235330..f3e6c9c60e60 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -56,7 +56,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): " \ && export CXXFLAGS=" \ $(if $(filter MSC,$(COM)),$(if $(MSVC_USE_DEBUG_RUNTIME),-DMSVC_USE_DEBUG_RUNTIME)) \ - $(if $(shell test '$(GCC_VERSION)' -ge 600 && echo yes),-fno-sized-deallocation -fno-delete-null-pointer-checks,) \ + $(if $(HAVE_GCC_FNO_SIZED_DEALLOCATION),-fno-sized-deallocation -fno-delete-null-pointer-checks) \ $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \ $(BOOST_CPPFLAGS) \ -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \ |