[Libreoffice-commits] .: solenv/gbuild solenv/inc

[Lubos Lunak]

 solenv/gbuild/platform/unxgcc.mk |    4 ++++
 solenv/inc/unxgcc.mk             |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit cc9a10185749210825fe6970ea4b103eb78e329e
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Mar 15 10:30:39 2012 +0100

    clang doesn't have a problem with -Wnon-virtual-dtor
    
    Even if some older version possibly does, I doubt anybody would
    realistically use it.

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 1565d1c..9c2b405 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -65,6 +65,7 @@ gb_CXXFLAGS := \
 	-Wsign-promo \
 	-Woverloaded-virtual \
 
+ifneq ($(COM_GCC_IS_CLANG),TRUE)
 # Only GCC 4.6 has a fix for <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=7302>
 # "-Wnon-virtual-dtor should't complain of protected dtor" and supports #pragma
 # GCC diagnostic push/pop required e.g. in cppuhelper/propertysetmixin.hxx to
@@ -75,6 +76,9 @@ gb_CXXFLAGS += -Wno-non-virtual-dtor
 else
 gb_CXXFLAGS += -Wnon-virtual-dtor
 endif
+else
+gb_CXXFLAGS += -Wnon-virtual-dtor
+endif
 
 ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
 gb_COMPILERDEFS += \
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 5ef9f98..4f9ebee 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -148,6 +148,7 @@ CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
 CFLAGSWERRCC=-Werror -DLIBO_WERROR
 
+.IF "$(COM_GCC_IS_CLANG)" != "TRUE"
 # Only GCC 4.6 has a fix for <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=7302>
 # "-Wnon-virtual-dtor should't complain of protected dtor" and supports #pragma
 # GCC diagnostic push/pop required e.g. in cppuhelper/propertysetmixin.hxx to
@@ -158,6 +159,9 @@ CFLAGSWARNCXX += -Wno-non-virtual-dtor
 .ELSE
 CFLAGSWARNCXX += -Wnon-virtual-dtor
 .END
+.ELSE
+CFLAGSWARNCXX += -Wnon-virtual-dtor
+.END
 
 COMPILER_WARN_ERRORS=TRUE