Generalize COM_GCC_IS_CLANG -> COM_IS_CLANG

...in anticipation of building with clang-cl.exe on Windows

Change-Id: I1d723c9d3b5ca8a2bc6b27ef0189a7b053581398
Reviewed-on: https://gerrit.libreoffice.org/19928
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

27 files changed, 84 insertions, 90 deletions

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 4411eb2bd0a3..702d462359db 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -217,7 +217,7 @@ endif
 endif
 
 ifeq ($(COM),GCC)
-ifneq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(COM_IS_CLANG),TRUE)
 bridges_NON_CALL_EXCEPTIONS_FLAGS := -fnon-call-exceptions
 endif
 endif
diff --git a/compilerplugins/Makefile.mk b/compilerplugins/Makefile.mk
index 4a58ddd68f92..5da6967c1617 100644
--- a/compilerplugins/Makefile.mk
+++ b/compilerplugins/Makefile.mk
@@ -19,7 +19,7 @@ compilerplugins.clean:
 
 else
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 
 compilerplugins:
 	$(MAKE) $(PARALLELISM_OPTION) -f $(SRCDIR)/compilerplugins/Makefile-clang.mk compilerplugins
diff --git a/config_host.mk.in b/config_host.mk.in
index b6cbab6d77c3..26200a08d60d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -68,7 +68,7 @@ export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@
 export COMMONS_LOGGING_VERSION=@COMMONS_LOGGING_VERSION@
 export COMPATH=@COMPATH@
 export COMPILER_PLUGINS=@COMPILER_PLUGINS@
-export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
+export COM_IS_CLANG=@COM_IS_CLANG@
 export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
 export CPUNAME=@CPUNAME@
diff --git a/configure.ac b/configure.ac
index 408abd52f6ff..5737d68d3dac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3267,63 +3267,6 @@ else
 fi
 AC_SUBST(CROSS_COMPILING)
 
-dnl ===================================================================
-dnl  Is GCC actually Clang?
-dnl ===================================================================
-
-COM_GCC_IS_CLANG=
-if test "$GCC" = "yes"; then
-    AC_MSG_CHECKING([whether GCC is actually Clang])
-    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-        #ifndef __clang__
-        you lose
-        #endif
-        int foo=42;
-        ]])],
-        [AC_MSG_RESULT([yes])
-         COM_GCC_IS_CLANG=TRUE],
-        [AC_MSG_RESULT([no])])
-
-    if test "$COM_GCC_IS_CLANG" = TRUE; then
-        AC_MSG_CHECKING([the Clang version])
-        clang_version=`echo __clang_major__.__clang_minor__.__clang_patchlevel__ | $CC -E -P /dev/stdin`
-        CLANG_FULL_VERSION=`echo __clang_version__ | $CC -E -P /dev/stdin`
-        CLANGVER=`echo $clang_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-        AC_MSG_RESULT([Clang $CLANG_FULL_VERSION, $CLANGVER])
-        AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
-    fi
-fi
-AC_SUBST(COM_GCC_IS_CLANG)
-
-if test "$CCACHE" != "" -a "$COM_GCC_IS_CLANG" = TRUE; then
-    if test -z "$CCACHE_CPP2"; then
-        AC_MSG_WARN([Using ccache with Clang without CCACHE_CPP2 set causes spurious warnings.])
-        add_warning "Using ccache with Clang without CCACHE_CPP2 set causes spurious warnings."
-    fi
-fi
-
-dnl ===================================================================
-dnl  Test the gcc version
-dnl ===================================================================
-if test "$GCC" = "yes" -a -z "$COM_GCC_IS_CLANG"; then
-    AC_MSG_CHECKING([the GCC version])
-    _gcc_version=`$CC -dumpversion`
-    GCC_VERSION=`echo $_gcc_version | $AWK -F. '{ print \$1*100+\$2 }'`
-
-    AC_MSG_RESULT([gcc $_gcc_version])
-
-    if test "$GCC_VERSION" -lt 0407; then
-        AC_MSG_ERROR([GCC $_gcc_version is too old, must be at least GCC 4.7.0])
-    fi
-else
-    # Explicitly force GCC_VERSION to be empty, even for Clang, to check incorrect uses.
-    # GCC version should generally be checked only when handling GCC-specific bugs, for testing
-    # things like features configure checks should be used, otherwise they may e.g. fail with Clang
-    # (which reports itself as GCC 4.2.1).
-    GCC_VERSION=
-fi
-AC_SUBST(GCC_VERSION)
-
 # ===================================================================
 # check various GCC options that Clang does not support now but maybe
 # will somewhen in the future, check them even for GCC, so that the
@@ -3856,6 +3799,35 @@ fi
 UNOWINREG_DLL="185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 AC_SUBST(UNOWINREG_DLL)
 
+COM_IS_CLANG=
+AC_MSG_CHECKING([whether the compiler is actually Clang])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+    #ifndef __clang__
+    you lose
+    #endif
+    int foo=42;
+    ]])],
+    [AC_MSG_RESULT([yes])
+     COM_IS_CLANG=TRUE],
+    [AC_MSG_RESULT([no])])
+
+if test "$COM_IS_CLANG" = TRUE; then
+    AC_MSG_CHECKING([the Clang version])
+    clang_version=`echo __clang_major__.__clang_minor__.__clang_patchlevel__ | $CC -E -P /dev/stdin`
+    CLANG_FULL_VERSION=`echo __clang_version__ | $CC -E -P /dev/stdin`
+    CLANGVER=`echo $clang_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+    AC_MSG_RESULT([Clang $CLANG_FULL_VERSION, $CLANGVER])
+    AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
+fi
+AC_SUBST(COM_IS_CLANG)
+
+if test "$CCACHE" != "" -a "$COM_IS_CLANG" = TRUE; then
+    if test -z "$CCACHE_CPP2"; then
+        AC_MSG_WARN([Using ccache with Clang without CCACHE_CPP2 set causes spurious warnings.])
+        add_warning "Using ccache with Clang without CCACHE_CPP2 set causes spurious warnings."
+    fi
+fi
+
 #
 # prefix C with ccache if needed
 #
@@ -3878,6 +3850,28 @@ if test "$CCACHE" != ""; then
     AC_LANG_POP([C])
 fi
 
+dnl ===================================================================
+dnl  Test the gcc version
+dnl ===================================================================
+if test "$GCC" = "yes" -a -z "$COM_IS_CLANG"; then
+    AC_MSG_CHECKING([the GCC version])
+    _gcc_version=`$CC -dumpversion`
+    GCC_VERSION=`echo $_gcc_version | $AWK -F. '{ print \$1*100+\$2 }'`
+
+    AC_MSG_RESULT([gcc $_gcc_version])
+
+    if test "$GCC_VERSION" -lt 0407; then
+        AC_MSG_ERROR([GCC $_gcc_version is too old, must be at least GCC 4.7.0])
+    fi
+else
+    # Explicitly force GCC_VERSION to be empty, even for Clang, to check incorrect uses.
+    # GCC version should generally be checked only when handling GCC-specific bugs, for testing
+    # things like features configure checks should be used, otherwise they may e.g. fail with Clang
+    # (which reports itself as GCC 4.2.1).
+    GCC_VERSION=
+fi
+AC_SUBST(GCC_VERSION)
+
 dnl Set the ENABLE_DBGUTIL variable
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build with additional debug utilities])
@@ -5931,7 +5925,7 @@ if test "$GCC" = "yes"; then
             HAVE_THREADSAFE_STATICS=TRUE
         fi
     elif test "$_os" != Android; then
-        if test "$COM_GCC_IS_CLANG" = TRUE; then
+        if test "$COM_IS_CLANG" = TRUE; then
             AC_LANG_PUSH([C++])
             AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <list>
@@ -6469,7 +6463,7 @@ _ACEOF
             dnl known to not work with -z defs (unsetting which makes the test
             dnl moot, though):
             my_linkflagsnoundefs=$LINKFLAGSNOUNDEFS
-            if test "$COM_GCC_IS_CLANG" = TRUE; then
+            if test "$COM_IS_CLANG" = TRUE; then
                 for i in $CXX; do
                     case $i in
                     -fsanitize=*)
@@ -6595,7 +6589,7 @@ dnl ===================================================================
 
 COMPILER_PLUGINS=
 # currently only Clang
-if test "$COM_GCC_IS_CLANG" = "TRUE"; then
+if test "$COM_IS_CLANG" = "TRUE"; then
     if test -n "$enable_compiler_plugins"; then
         compiler_plugins="$enable_compiler_plugins"
     elif test -n "$ENABLE_DBGUTIL"; then
@@ -8231,7 +8225,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
         fi
         AC_MSG_CHECKING([for MariaDB Client library])
         MARIADB_CFLAGS=`$MARIADBCONFIG --cflags`
-        if test "$COM_GCC_IS_CLANG" = TRUE; then
+        if test "$COM_IS_CLANG" = TRUE; then
             MARIADB_CFLAGS=$(printf '%s' "$MARIADB_CFLAGS" | sed -e s/-fstack-protector-strong//)
         fi
         MARIADB_LIBS=`$MARIADBCONFIG --libs_r`
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk
index 9c2e6450a2f9..a8f4976310df 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_CppunitTest_use_external,connectivity_commontools,boost_headers
 $(eval $(call gb_CppunitTest_use_sdk_api,connectivity_commontools))
 
 ifeq ($(COM),GCC)
-ifneq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(COM_IS_CLANG),TRUE)
 $(eval $(call gb_CppunitTest_add_cxxflags,connectivity_commontools,\
 	-fpermissive \
 ))
diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk
index 35c8357c5edb..ce061a11fa8b 100644
--- a/external/cairo/UnpackedTarball_cairo.mk
+++ b/external/cairo/UnpackedTarball_cairo.mk
@@ -41,7 +41,7 @@ ifneq (,$(filter ANDROID IOS,$(OS)))
 $(eval $(call gb_UnpackedTarball_add_file,cairo,.,external/cairo/cairo/dummy_pkg_config))
 endif
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,cairo,\
 	external/cairo/cairo/no-flto-clang.patch \
 ))
diff --git a/external/graphite/StaticLibrary_graphite.mk b/external/graphite/StaticLibrary_graphite.mk
index ddbf9955e6d7..4f645666197d 100644
--- a/external/graphite/StaticLibrary_graphite.mk
+++ b/external/graphite/StaticLibrary_graphite.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_StaticLibrary_add_defs,graphite,\
 ))
 
 ifeq ($(COM),GCC)
-ifneq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(COM_IS_CLANG),TRUE)
 $(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\
 	 -fpermissive \
 ))
diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk
index eb6b75cf470b..b0d1610671c7 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0))
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libabw, \
     external/libabw/ubsan-visibility.patch \
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk
index f43bd1b53dfd..e3c218386f50 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
     external/libcdr/ubsan-visibility.patch \
diff --git a/external/libcmis/StaticLibrary_cmis.mk b/external/libcmis/StaticLibrary_cmis.mk
index 76c0866c289c..eb5b4f5d581d 100644
--- a/external/libcmis/StaticLibrary_cmis.mk
+++ b/external/libcmis/StaticLibrary_cmis.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,cmislib))
 
 $(eval $(call gb_StaticLibrary_set_warnings_not_errors,cmislib))
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 # Avoid narrowing conversion error (even though the option is technically a warning)
 # caused by boost.
 $(eval $(call gb_StaticLibrary_add_cxxflags,cmislib,\
diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk
index 4d8622efa8a7..094d4e93839c 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libebook, \
     external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1 \
 ))
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libebook, \
     external/libebook/ubsan-visibility.patch \
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 7f0d653d9b7c..88cfda31629a 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
 endif
 endif
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \
     external/libetonyek/ubsan-visibility.patch \
diff --git a/external/libexttextcat/ExternalProject_exttextcat.mk b/external/libexttextcat/ExternalProject_exttextcat.mk
index fdad93b77677..262af0b22df3 100644
--- a/external/libexttextcat/ExternalProject_exttextcat.mk
+++ b/external/libexttextcat/ExternalProject_exttextcat.mk
@@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,exttextcat,build):
 		./configure --disable-shared --with-pic \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_DEBUG_CFLAGS) $(gb_COMPILEROPTFLAGS) \
-			$(if $(COM_GCC_IS_CLANG),-Qunused-arguments) \
+			$(if $(COM_IS_CLANG),-Qunused-arguments) \
 			$(if $(filter AIX,$(OS)),-D_LINUX_SOURCE_COMPAT)" \
 		&& $(MAKE) \
 	)
diff --git a/external/libfreehand/UnpackedTarball_libfreehand.mk b/external/libfreehand/UnpackedTarball_libfreehand.mk
index c1abfa38a519..7394b98fe8ae 100644
--- a/external/libfreehand/UnpackedTarball_libfreehand.mk
+++ b/external/libfreehand/UnpackedTarball_libfreehand.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libfreehand,\
     external/libfreehand/replace_transform_class_with_struct.patch \
 ))
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libfreehand, \
     external/libfreehand/ubsan-visibility.patch \
diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk
index a8c673c877f3..57845333cb4e 100644
--- a/external/libmspub/UnpackedTarball_libmspub.mk
+++ b/external/libmspub/UnpackedTarball_libmspub.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmspub,\
     external/libmspub/ubsan.patch \
 ))
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libmspub, \
     external/libmspub/ubsan-visibility.patch \
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 823fab2f04a3..072da50ed5f6 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,0))
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
     external/libmwaw/ubsan-visibility.patch \
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 1c002c8aa9e7..3cbeb5502d08 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
     external/libodfgen/ubsan-visibility.patch \
diff --git a/external/libpagemaker/UnpackedTarball_libpagemaker.mk b/external/libpagemaker/UnpackedTarball_libpagemaker.mk
index 6322c2e7091a..ad857107698e 100644
--- a/external/libpagemaker/UnpackedTarball_libpagemaker.mk
+++ b/external/libpagemaker/UnpackedTarball_libpagemaker.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libpagemaker,$(PAGEMAKER_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libpagemaker,0))
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libpagemaker, \
     external/libpagemaker/ubsan-visibility.patch \
diff --git a/external/librevenge/UnpackedTarball_librevenge.mk b/external/librevenge/UnpackedTarball_librevenge.mk
index 192faf4a5044..d44678469389 100644
--- a/external/librevenge/UnpackedTarball_librevenge.mk
+++ b/external/librevenge/UnpackedTarball_librevenge.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,librevenge,$(REVENGE_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,librevenge,0))
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,librevenge, \
     external/librevenge/ubsan-visibility.patch \
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk
index 9b555d4706ef..027c38e5b755 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
        external/libvisio/ubsan.patch \
 ))
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
     external/libvisio/ubsan-visibility.patch \
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index 5fad6b6ba620..754bd59a09c5 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
 endif
 endif
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
     external/libwps/ubsan-visibility.patch.0 \
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index d297ee4b1e45..4afd2751fdc3 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 ))
 endif
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 	external/nss/asan.patch.1 \
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
index 8cb8e58d9d9b..3ddac8cd14d4 100644
--- a/jurt/Library_jpipe.mk
+++ b/jurt/Library_jpipe.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_add_cobjects,jpipe,\
 
 else
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(gb_CC)),)
 Library_jpipe__staticsalhack = TRUE
 endif
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 9c81e34fef27..a0ff3109d285 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -25,7 +25,7 @@ gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 include $(GBUILDDIR)/platform/windows.mk
 
-ifeq ($(COM_GCC_IS_CLANG),)
+ifeq ($(COM_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
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index d358b367f65b..917b1557dec7 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -152,7 +152,7 @@ endef
 
 # PrecompiledHeader class
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 gb_PrecompiledHeader_get_enableflags = -include-pch $(call gb_PrecompiledHeader_get_target,$(1))
 else
 gb_PrecompiledHeader_get_enableflags = -include $(notdir $(subst .gch,,$(call gb_PrecompiledHeader_get_target,$(1)))) \
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 67af078bb7b3..3f7960550cef 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -93,7 +93,7 @@ gb_VISIBILITY_FLAGS := -DHAVE_GCC_VISIBILITY_FEATURE
 # If CC or CXX already include -fvisibility=hidden, don't duplicate it
 ifeq (,$(filter -fvisibility=hidden,$(CC)))
 gb__visibility_hidden := -fvisibility=hidden
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 gb__visibility_hidden := -fvisibility-ms-compat
 endif
@@ -115,7 +115,7 @@ endif
 gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror)
 
 # This is the default in non-C++11 mode
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 gb_CXX03FLAGS := -std=gnu++98 -Werror=c++11-extensions -Wno-c++11-long-long \
     -Wno-deprecated-declarations
 else
@@ -128,7 +128,7 @@ endif
 gb_CFLAGS_COMMON += -std=gnu89
 
 ifeq ($(ENABLE_LTO),TRUE)
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 gb_LTOFLAGS := -flto
 else
 gb_LTOFLAGS := -flto=$(PARALLELISM) -fuse-linker-plugin -O2
@@ -179,7 +179,7 @@ gb_LinkTarget_INCLUDE :=\
     $(subst -I. , ,$(SOLARINC)) \
     -I$(BUILDDIR)/config_$(gb_Side) \
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifeq ($(COMPILER_PLUGIN_TOOL),)
 gb_COMPILER_PLUGINS := -Xclang -load -Xclang $(BUILDDIR)/compilerplugins/obj/plugin.so -Xclang -add-plugin -Xclang loplugin
 ifneq ($(COMPILER_PLUGIN_WARNINGS_ONLY),)
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 284e70c79f5e..0b4ced4be997 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -8,7 +8,7 @@
 #
 
 gb__LinkTarget_LDFLAGS_zdefs := -Wl,-z,defs
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 gb__LinkTarget_LDFLAGS_zdefs :=
 endif