diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-11-28 13:45:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-11-28 18:48:47 +0100 |
| commit | c8e37ef268cae23a92c298721f1493daeda323c2 (patch) | |
| tree | 655b38af02b11f1cce1f6f796a6d2ae95cb0d989 /external | |
| parent | 46f091f714f3f29a88c801b1903e229b4a0a79b2 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libcmis/StaticLibrary_libcmis.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 |