external/libcmis/StaticLibrary_libcmis.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c8e37ef268cae23a92c298721f1493daeda323c2
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Nov 28 13:45:00 2017 +0100
external/libcmis: Falling back to C++03 is too drastic
e.g. when compiling against system libxml2, which in turn includes system
ICU include files, which may use C++11 chart16_t. So assume that
-std=gnu++14
is acceptable for any GCC version for which at least on of -std=gnu++17,
-std=gnu++1z, -std=c++17, -std=c++1z is acceptable, and just fall back to
C++14.
Change-Id: Id9f07ab4f419e5683f4fb9c9b2d3bdda251cdd1b
Reviewed-on: https://gerrit.libreoffice.org/45409
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/libcmis/StaticLibrary_libcmis.mk
b/external/libcmis/StaticLibrary_libcmis.mk
index b3940b7a749a..39b9545d5345 100644
--- a/external/libcmis/StaticLibrary_libcmis.mk
+++ b/external/libcmis/StaticLibrary_libcmis.mk
@@ -23,14 +23,14 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,libcmis,\
))
endif
-# Build as C++03 if necessary to avoid GCC C++17 "error: ISO C++1z does not
+# Build as C++14 if necessary to avoid GCC C++17 "error: ISO C++1z does not
# allow dynamic exception specifications", until upstream libcmis is ported to
# C++17:
ifeq ($(COM)-$(COM_IS_CLANG),GCC-)
$(eval $(call gb_StaticLibrary_add_cxxflags,libcmis, \
$(if $(filter -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z, \
$(CXXFLAGS_CXX11)), \
- $(gb_CXX03FLAGS)) \
+ -std=gnu++14) \
))
endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
