diff options
| author | Eike Rathke <erack@redhat.com> | 2017-11-17 11:03:45 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-11-20 19:28:10 +0100 |
| commit | 9206a08ada00e8762c4a634f242bd566028964bb (patch) | |
| tree | eaa317ce6717d44f75c077a6db147b0ebd4994b7 /external/firebird | |
| parent | a8687041c46b3fe93a76faa0a4a65e7069ef5e9d (diff) | |
Upgrade to ICU 60.1
Change-Id: I6d90f51ee88c4e1005edbaa93d23cfb94cb2acfb
Reviewed-on: https://gerrit.libreoffice.org/44871
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'external/firebird')
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 17d4f55c6641..8f2b576de115 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -26,6 +26,10 @@ ifneq ($(OS),WNT) INVOKE_FPA:="CPU=\$$(EMPTY) $${FB_CPU_ARG}" endif +ifeq ($(COM_IS_CLANG),TRUE) +firebird_NO_CXX11_NARROWING := -Wno-c++11-narrowing +endif + MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,icu)/source/lib) LC_ALL=C MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \ @@ -70,6 +74,8 @@ $(call gb_ExternalProject_get_state_target,firebird,build): $(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \ -L$(call gb_UnpackedTarball_get_dir,libtommath) \ ) \ + $(CXXFLAGS_CXX11) \ + $(firebird_NO_CXX11_NARROWING) \ " \ && export LDFLAGS=" \ $(if $(SYSTEM_ICU),$(ICU_LIBS), \ |