summaryrefslogtreecommitdiffstats
path: root/external
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-02-16 18:11:24 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-02-16 18:11:24 +0100
commite16644fa1c042b56a1301f0476d7ddb71c8765ea (patch)
tree447c886c89f55e03e26a1652a9d98da6203111af /external
parentexternal/libcmis: Silence -Wdynamic-exception-spec errors (diff)
downloadcore-e16644fa1c042b56a1301f0476d7ddb71c8765ea.tar.gz
core-e16644fa1c042b56a1301f0476d7ddb71c8765ea.zip
external/mysqlcppconn: Silence -Wdynamic-exception-spec errors
...with Clang in C++17 mode Change-Id: If51c0788439688f6fbd77c1a05cb3295ac6e8cb4
Diffstat (limited to 'external')
-rw-r--r--external/mysqlcppconn/Library_mysqlcppconn.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk
index e2894824bc18..70599b05e328 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -58,6 +58,15 @@ $(eval $(call gb_Library_add_libs,mysqlcppconn,\
))
endif
+# Avoid -Wdynamic-exception-spec errors in Clang C++17 mode:
+ifeq ($(COM_IS_CLANG),TRUE)
+$(eval $(call gb_Library_add_cxxflags,mysqlcppconn, \
+ $(if $(filter -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z, \
+ $(CXXFLAGS_CXX11)), \
+ -Wno-error=dynamic-exception-spec) \
+))
+endif
+
$(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
UnpackedTarball/mysqlcppconn/driver/mysql_art_resultset \
UnpackedTarball/mysqlcppconn/driver/mysql_art_rset_metadata \