From 14ed889c45eccb16647b4fe679db2deda53ddca5 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 16 Feb 2017 18:10:12 +0100
Subject: external/libcmis: Silence -Wdynamic-exception-spec errors

...with Clang in C++17 mode

Change-Id: I50a0568c13e3e7a2d37ebd739d587985b2f9bc8a
---
 external/libcmis/StaticLibrary_cmis.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'external')

diff --git a/external/libcmis/StaticLibrary_cmis.mk b/external/libcmis/StaticLibrary_cmis.mk
index eb5b4f5d581d..4eb1c97d017c 100644
--- a/external/libcmis/StaticLibrary_cmis.mk
+++ b/external/libcmis/StaticLibrary_cmis.mk
@@ -14,8 +14,12 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,cmislib))
 ifeq ($(COM_IS_CLANG),TRUE)
 # Avoid narrowing conversion error (even though the option is technically a warning)
 # caused by boost.
+# Also avoid -Wdynamic-exception-spec errors in C++17 mode.
 $(eval $(call gb_StaticLibrary_add_cxxflags,cmislib,\
     -Wno-error=c++11-narrowing \
+    $(if $(filter -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z, \
+            $(CXXFLAGS_CXX11)), \
+        -Wno-error=dynamic-exception-spec) \
 ))
 endif
 
-- 
cgit