summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-11 16:45:56 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-11 16:45:56 +0200
commitf14cedc4fd7ba784da3f7ca067a1af18b758e368 (patch)
treeebaab8e52363b9cd1f70be9de230943a19364cb3 /solenv
parent9a521e3d1f47044f157c59f215ee5b4e5b385365 (diff)
Silence Clang -Werror,-Wreturn-type-c-linkage
...after 9f016bd69422bdfb4cf7c4f5e57356eb98db2d8c "Switch VclBuilder constructors to use VclPtr." Change-Id: Ifc556c471bfbe3d0abf921ce3556ce75ad7a82ce
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/com_GCC_defs.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 5b5a2bd3de03..1bb4017072c1 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -72,6 +72,14 @@ gb_CXXFLAGS_COMMON := \
-fno-common \
-pipe \
+# VCL_BUILDER_DECL_FACTORY (include/vcl/builderfactory.hxx) routinely causes
+# "'make...' has C-linkage specified, but returns user-defined type
+# 'VclPtr<vcl::Window>' which is incompatible with C
+# [-Werror,-Wreturn-type-c-linkage]":
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+gb_CXXFLAGS_COMMON += -Wno-return-type-c-linkage
+endif
+
gb_CXXFLAGS_Wundef = -Wno-undef
ifneq ($(HAVE_THREADSAFE_STATICS),TRUE)