external/firebird/ExternalProject_firebird.mk | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 0a42105a8d95473646b850eed6d428ebb93fc01f
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Fri Feb 1 19:35:03 2019 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Sun Feb 3 14:59:27 2019 +0100
firebird: fix CXXFLAGS
In 3.0.4, the horrible makefiles override the CXXFLAGS variable:
firebird/builds/posix/prefix.linux_generic:CXXFLAGS=-std=gnu++03
Work around that by passing LO's customised CXXFLAGS as a command-line
parameter to make, which in turn overrides the definition in the
makefile.
Other platforms, in particular Darwin, apparently extend CXXFLAGS
instead of overwriting.
To nobody's surprise, gnu++03 doesn't even build with clang because ICU
headers use C++11 features (although strangely gcc doesn't complain).
Change-Id: If3b26482a4f4bf284057e261677cd7182656154f
Reviewed-on: https://gerrit.libreoffice.org/67255
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index d0614e202951..3b444397442d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -97,9 +97,17 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
&& if [ -n "$${FB_CPU_ARG}" ]; then \
- $(MAKE_PRE) $(MAKE) $(if $(ENABLE_DEBUG),Debug)
$(INVOKE_FPA) SHELL='$(SHELL)' LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst
$$,$$$$,$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,icu)/source/lib)))' $(MAKE_POST); \
+ $(MAKE_PRE) $(MAKE) \
+ $(if $(filter
LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+ $(if $(ENABLE_DEBUG),Debug)
$(INVOKE_FPA) SHELL='$(SHELL)' \
+ LIBO_TUNNEL_LIBRARY_PATH='$(subst
','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
+ $(MAKE_POST); \
else \
- $(MAKE_PRE) $(MAKE) $(if $(ENABLE_DEBUG),Debug)
SHELL='$(SHELL)' LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst
$$,$$$$,$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,icu)/source/lib)))' $(MAKE_POST); \
+ $(MAKE_PRE) $(MAKE) \
+ $(if $(filter
LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+ $(if $(ENABLE_DEBUG),Debug)
SHELL='$(SHELL)' \
+ LIBO_TUNNEL_LIBRARY_PATH='$(subst
','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
+ $(MAKE_POST); \
fi \
)
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
