try to ensure not testing GCC version when using Clang

Clang reports itself as GCC 4.2.1 when asked the GCC way, which is about
as good an answer as any, since there's no good mapping between them.
So when testing GCC version, Clang would be usually considered too old,
and therefore the proper way is to do a configure check if possible.
GCC version should be only used for GCC-specific things such as avoiding
a bug in a specific GCC version, and such testing should first check
the compiler is not Clang.
Rename GCCVER to GCC_VERSION and use it throughout the build system
where needed. As it's empty for anything that's not GCC, this should
lead to errors when used incorrectly.

Change-Id: Iea96bbaf5d8ceabefa25be88576eeb4115384937

4 files changed, 21 insertions, 21 deletions

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 49b0103b1562..728e0426322f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -25,12 +25,11 @@ gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 include $(GBUILDDIR)/platform/windows.mk
 
+ifeq ($(COM_GCC_IS_CLANG),)
 # This has to do something with calling conventions, which are different
 # for x86 and x64. Don't put it in the common part since it is breaking
 # and conde that uses boost::bind
-gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- \
-    '{ print $$1*10000+$$2*100+$$3 }')
-gb_GccLess470 := $(shell expr $(gb_CCVER) \< 40700)
+gb_GccLess470 := $(shell expr $(GCC_VERSION) \< 407)
 
 # Until GCC 4.6, MinGW used __cdecl by default, and BOOST_MEM_FN_ENABLE_CDECL
 # would result in ambiguous calls to overloaded boost::bind; since GCC 4.7,
@@ -39,6 +38,7 @@ gb_GccLess470 := $(shell expr $(gb_CCVER) \< 40700)
 ifeq ($(gb_GccLess470),0)
 gb_COMPILERDEFS += -DBOOST_MEM_FN_ENABLE_CDECL
 endif
+endif
 
 include $(GBUILDDIR)/platform/mingw.mk
 
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index b229258e0375..566d87116ea7 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -37,8 +37,6 @@ ifeq ($(strip $(gb_COMPILERDEFAULTOPTFLAGS)),)
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 endif
 
-gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
-
 gb_SHORTSTDC3 := 1
 gb_SHORTSTDCPP3 := 6
 
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 58c9b6835b9d..f9d236b1c466 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -74,8 +74,8 @@ gb_COMPILERDEFS += \
 
 endif
 
-gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
-gb_GccLess460 := $(shell expr $(gb_CCVER) \< 40600)
+ifeq ($(COM_GCC_IS_CLANG),)
+gb_GccLess460 := $(shell expr $(GCC_VERSION) \< 406)
 
 #At least SLED 10.2 gcc 4.3 overly agressively optimizes uno::Sequence into
 #junk, so only strict-alias on >= 4.6.0
@@ -85,6 +85,7 @@ ifeq ($(gb_StrictAliasingUnsafe),1)
 gb_CFLAGS += -fno-strict-aliasing
 gb_CXXFLAGS += -fno-strict-aliasing
 endif
+endif
 
 ifeq ($(HAVE_CXX11),TRUE)
 #Currently, as well as for its own merits, c++11/c++0x mode allows use to use
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 17b9eb2c413c..9eb79fd9e2c0 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -23,9 +23,6 @@ gb_PROGRAMDIRNAME := program
 
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 
-gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
-gb_GccLess460 := $(shell expr $(gb_CCVER) \< 40600)
-
 gb_MKTEMP := mktemp -t gbuild.XXXXXX
 
 ifneq ($(origin AR),default)
@@ -51,7 +48,9 @@ gb_CXXFLAGS := \
 	-Wshadow \
 	-Woverloaded-virtual \
 
-ifneq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_GCC_IS_CLANG),)
+gb_GccLess460 := $(shell expr $(GCC_VERSION) \< 406)
+
 # 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
@@ -62,16 +61,6 @@ gb_CXXFLAGS += -Wno-non-virtual-dtor
 else
 gb_CXXFLAGS += -Wnon-virtual-dtor
 endif
-else
-gb_CXXFLAGS += -Wnon-virtual-dtor
-endif
-
-# enable debug STL
-ifeq ($(gb_ENABLE_DBGUTIL),$(true))
-gb_COMPILERDEFS += \
-	-D_GLIBCXX_DEBUG \
-
-endif
 
 #At least SLED 10.2 gcc 4.3 overly agressively optimizes uno::Sequence into
 #junk, so only strict-alias on >= 4.6.0
@@ -82,6 +71,18 @@ gb_CFLAGS += -fno-strict-aliasing
 gb_CXXFLAGS += -fno-strict-aliasing
 endif
 
+else # Clang
+gb_CXXFLAGS += -Wnon-virtual-dtor
+endif
+
+
+# enable debug STL
+ifeq ($(gb_ENABLE_DBGUTIL),$(true))
+gb_COMPILERDEFS += \
+	-D_GLIBCXX_DEBUG \
+
+endif
+
 ifeq ($(HAVE_CXX11),TRUE)
 #Currently, as well as for its own merits, c++11/c++0x mode allows use to use
 #a template for SAL_N_ELEMENTS to detect at compiler time its misuse