CLANG_C -> CLANG_CC

Change-Id: I50ed05116df3f295af6406f0ee45610d9e1e031e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92619
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>

3 files changed, 18 insertions, 18 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index 0e7dad69a588..51fc419414e6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -65,7 +65,7 @@ export CCACHE_DEPEND_MODE=@CCACHE_DEPEND_MODE@
 export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@
 export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
 @x_CFLAGS@ export CFLAGS=@CFLAGS@
-export CLANG_C=@CLANG_C@
+export CLANG_CC=@CLANG_CC@
 export CLANG_CXX=@CLANG_CXX@
 export CLANG_CXXFLAGS_INTRINSICS_SSE2=@CLANG_CXXFLAGS_INTRINSICS_SSE2@
 export CLANG_CXXFLAGS_INTRINSICS_SSSE3=@CLANG_CXXFLAGS_INTRINSICS_SSSE3@
diff --git a/configure.ac b/configure.ac
index d33e978fa255..b23961b414dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11132,40 +11132,40 @@ CLANG_CXXFLAGS_INTRINSICS_F16C=
 CLANG_CXXFLAGS_INTRINSICS_FMA=
 
 if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then
-    if test -n "$CLANG_C" -a -n "$CLANG_CXX"; then
+    if test -n "$CLANG_CC" -a -n "$CLANG_CXX"; then
         AC_MSG_CHECKING([for Clang])
-        AC_MSG_RESULT([$CLANG_C / $CLANG_CXX])
+        AC_MSG_RESULT([$CLANG_CC / $CLANG_CXX])
     else
         if test "$_os" = "WINNT"; then
             AC_MSG_CHECKING([for clang-cl])
             if test -x "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"; then
-                CLANG_C=`win_short_path_for_make "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"`
+                CLANG_CC=`win_short_path_for_make "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"`
                 dnl match our MSVC default, also explicitly set -m32/-m64
                 if test "$BITNESS_OVERRIDE" = ""; then
-                    CLANG_C="$CLANG_C -m32 -arch:SSE"
+                    CLANG_CC="$CLANG_CC -m32 -arch:SSE"
                 else
-                    CLANG_C="$CLANG_C -m64"
+                    CLANG_CC="$CLANG_CC -m64"
                 fi
-                CLANG_CXX="$CLANG_C"
-                AC_MSG_RESULT([$CLANG_C])
+                CLANG_CXX="$CLANG_CC"
+                AC_MSG_RESULT([$CLANG_CC])
             else
                 AC_MSG_RESULT([no])
             fi
         else
-            AC_CHECK_PROG(CLANG_C,clang,clang,[])
+            AC_CHECK_PROG(CLANG_CC,clang,clang,[])
             AC_CHECK_PROG(CLANG_CXX,clang++,clang++,[])
         fi
     fi
-    if test -n "$CLANG_C" -a -n "$CLANG_CXX"; then
-        clang2_version=`echo __clang_major__.__clang_minor__.__clang_patchlevel__ | $CLANG_C -E - | tail -1 | sed 's/ //g'`
+    if test -n "$CLANG_CC" -a -n "$CLANG_CXX"; then
+        clang2_version=`echo __clang_major__.__clang_minor__.__clang_patchlevel__ | $CLANG_CC -E - | tail -1 | sed 's/ //g'`
         clang2_ver=`echo "$clang2_version" | $AWK -F. '{ print \$1*10000+(\$2<100?\$2:99)*100+(\$3<100?\$3:99) }'`
         if test "$clang2_ver" -lt 50002; then
             AC_MSG_WARN(["$clang2_version" is too old or unrecognized, must be at least Clang 5.0.2])
-            CLANG_C=
+            CLANG_CC=
             CLANG_CXX=
         fi
     fi
-    if test -z "$CLANG_C" -o -z "$CLANG_CXX"; then
+    if test -z "$CLANG_CC" -o -z "$CLANG_CXX"; then
         # So far do not require this, but release builds with Skia should possibly
         # do so.
         AC_MSG_WARN([Clang compiler not found.])
@@ -11355,7 +11355,7 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then
         CXX="$save_CXX"
     fi
 fi
-AC_SUBST(CLANG_C)
+AC_SUBST(CLANG_CC)
 AC_SUBST(CLANG_CXX)
 AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_SSE2)
 AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_SSSE3)
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 0cb81a0a1daa..287948b12a72 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -240,7 +240,7 @@ else
 $(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%)
 	$(call gb_Output_announce,$*.c,$(true),$(if $(COMPILER_TEST),C? ,C  ),3)
 	$(call gb_Trace_StartRange,$*.c,$(if $(COMPILER_TEST),C? ,C  ))
-	$(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$<,$(call gb_CObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS),$(T_C))
+	$(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$<,$(call gb_CObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS),$(T_CC))
 	$(call gb_Trace_EndRange,$*.c,$(if $(COMPILER_TEST),C? ,C  ))
 endif
 
@@ -328,7 +328,7 @@ $(call gb_GenCObject_get_target,%) : $(gb_FORCE_COMPILE_ALL_TARGET)
 	$(call gb_Output_announce,$*.c,$(true),C  ,3)
 	$(call gb_Trace_StartRange,$*.c,C  )
 	test -f $(call gb_GenCObject_get_source,$*) || (echo "Missing generated source file $(call gb_GenCObject_get_source,$*)" && false)
-	$(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$(call gb_GenCObject_get_source,$*),$(call gb_GenCObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS),$(T_C))
+	$(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$(call gb_GenCObject_get_source,$*),$(call gb_GenCObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS),$(T_CC))
 	$(call gb_Trace_EndRange,$*.c,C  )
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -836,7 +836,7 @@ $(call gb_LinkTarget_get_target,$(1)) : EXTERNAL_CODE :=
 $(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT :=
 $(call gb_LinkTarget_get_target,$(1)) : COMPILER_TEST :=
 $(call gb_LinkTarget_get_target,$(1)) : T_SYMBOLS := $(if $(call gb_LinkTarget__symbols_enabled,$(2)),$(true),$(false))
-$(call gb_LinkTarget_get_target,$(1)) : T_C :=
+$(call gb_LinkTarget_get_target,$(1)) : T_CC :=
 $(call gb_LinkTarget_get_target,$(1)) : T_CXX :=
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -1787,7 +1787,7 @@ endef
 # C/C++ files will be build with Clang (if possible) instead of the default compiler.
 # call gb_LinkTarget_use_clang,linktarget,,linktargetmakefilename
 define gb_LinkTarget_use_clang
-$(call gb_LinkTarget_get_target,$(1)) : T_C := $(CLANG_C)
+$(call gb_LinkTarget_get_target,$(1)) : T_CC := $(CLANG_CC)
 $(call gb_LinkTarget_get_target,$(1)) : T_CXX := $(CLANG_CXX)
 
 endef