Rename CLANG_CC, CLANG_CXX configuration vars (avoid clash with scan-build)

Clang's scan-build tool uses the CLANG_CXX environment variable (setting it up
in the scan-build script to pass it to the ccc-analyzer script), but happens to
erroneously set it to a non-existing path (see <https://reviews.llvm.org/D89481>
"[scan-build] Fix clang++ pathname again").  So wrapping LO's autogen.sh and
make in scan-build picked up that broken CLANG_CXX and caused build
failures like

> [CXX] external/skia/source/SkMemory_malloc.cxx
> /bin/sh: ~/llvm/inst/bin/clang-12++: No such file or directory

(see
<https://lists.freedesktop.org/archives/libreoffice/2020-October/086113.html>
"Re: llvm/clang static analyzer reports").

So rename CLANG_CXX, and for consistency also CLANG_CC and the various
CLANG_CXXFLAGS_INTRINSICS_*, by prefixing each with LO_.

Change-Id: Ib41cabe940f8bfb1997f74e865cca5725f859e07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104383
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

9 files changed, 91 insertions, 91 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index 6fff52b8a74c..57a4d686a057 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -67,16 +67,6 @@ 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_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@
-export CLANG_CXXFLAGS_INTRINSICS_SSE41=@CLANG_CXXFLAGS_INTRINSICS_SSE41@
-export CLANG_CXXFLAGS_INTRINSICS_SSE42=@CLANG_CXXFLAGS_INTRINSICS_SSE42@
-export CLANG_CXXFLAGS_INTRINSICS_AVX=@CLANG_CXXFLAGS_INTRINSICS_AVX@
-export CLANG_CXXFLAGS_INTRINSICS_AVX2=@CLANG_CXXFLAGS_INTRINSICS_AVX2@
-export CLANG_CXXFLAGS_INTRINSICS_F16C=@CLANG_CXXFLAGS_INTRINSICS_F16C@
-export CLANG_CXXFLAGS_INTRINSICS_FMA=@CLANG_CXXFLAGS_INTRINSICS_FMA@
 export CLANG_USE_LD=@CLANG_USE_LD@
 export CLANGDIR=@CLANGDIR@
 export CLANGLIBDIR=@CLANGLIBDIR@
@@ -400,6 +390,16 @@ export LIBXML_JAR=@LIBXML_JAR@
 export LIBXML_LIBS=$(gb_SPACE)@LIBXML_LIBS@
 export LIBXSLT_CFLAGS=$(gb_SPACE)@LIBXSLT_CFLAGS@
 export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@
+export LO_CLANG_CC=@LO_CLANG_CC@
+export LO_CLANG_CXX=@LO_CLANG_CXX@
+export LO_CLANG_CXXFLAGS_INTRINSICS_SSE2=@LO_CLANG_CXXFLAGS_INTRINSICS_SSE2@
+export LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3=@LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3@
+export LO_CLANG_CXXFLAGS_INTRINSICS_SSE41=@LO_CLANG_CXXFLAGS_INTRINSICS_SSE41@
+export LO_CLANG_CXXFLAGS_INTRINSICS_SSE42=@LO_CLANG_CXXFLAGS_INTRINSICS_SSE42@
+export LO_CLANG_CXXFLAGS_INTRINSICS_AVX=@LO_CLANG_CXXFLAGS_INTRINSICS_AVX@
+export LO_CLANG_CXXFLAGS_INTRINSICS_AVX2=@LO_CLANG_CXXFLAGS_INTRINSICS_AVX2@
+export LO_CLANG_CXXFLAGS_INTRINSICS_F16C=@LO_CLANG_CXXFLAGS_INTRINSICS_F16C@
+export LO_CLANG_CXXFLAGS_INTRINSICS_FMA=@LO_CLANG_CXXFLAGS_INTRINSICS_FMA@
 @x_LO_ELFCHECK_ALLOWLIST@ export LO_ELFCHECK_ALLOWLIST=@LO_ELFCHECK_ALLOWLIST@
 @x_Cygwin@ export LS=@WIN_LS@
 export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
diff --git a/configure.ac b/configure.ac
index 7449a78f7962..08c4e39cbe64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11594,47 +11594,47 @@ fi
 AC_SUBST(ENABLE_SKIA)
 AC_SUBST(ENABLE_SKIA_DEBUG)
 
-CLANG_CXXFLAGS_INTRINSICS_SSE2=
-CLANG_CXXFLAGS_INTRINSICS_SSSE3=
-CLANG_CXXFLAGS_INTRINSICS_SSE41=
-CLANG_CXXFLAGS_INTRINSICS_SSE42=
-CLANG_CXXFLAGS_INTRINSICS_AVX=
-CLANG_CXXFLAGS_INTRINSICS_AVX2=
-CLANG_CXXFLAGS_INTRINSICS_AVX512=
-CLANG_CXXFLAGS_INTRINSICS_F16C=
-CLANG_CXXFLAGS_INTRINSICS_FMA=
+LO_CLANG_CXXFLAGS_INTRINSICS_SSE2=
+LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3=
+LO_CLANG_CXXFLAGS_INTRINSICS_SSE41=
+LO_CLANG_CXXFLAGS_INTRINSICS_SSE42=
+LO_CLANG_CXXFLAGS_INTRINSICS_AVX=
+LO_CLANG_CXXFLAGS_INTRINSICS_AVX2=
+LO_CLANG_CXXFLAGS_INTRINSICS_AVX512=
+LO_CLANG_CXXFLAGS_INTRINSICS_F16C=
+LO_CLANG_CXXFLAGS_INTRINSICS_FMA=
 
 if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT" -a "$CPUNAME" = "ARM64" \); then
-    if test -n "$CLANG_CC" -a -n "$CLANG_CXX"; then
+    if test -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then
         AC_MSG_CHECKING([for Clang])
-        AC_MSG_RESULT([$CLANG_CC / $CLANG_CXX])
+        AC_MSG_RESULT([$LO_CLANG_CC / $LO_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_CC=`win_short_path_for_make "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"`
+                LO_CLANG_CC=`win_short_path_for_make "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"`
                 dnl explicitly set -m32/-m64
-                CLANG_CC="$CLANG_CC -m$WIN_HOST_BITS"
-                CLANG_CXX="$CLANG_CC"
-                AC_MSG_RESULT([$CLANG_CC])
+                LO_CLANG_CC="$LO_CLANG_CC -m$WIN_HOST_BITS"
+                LO_CLANG_CXX="$LO_CLANG_CC"
+                AC_MSG_RESULT([$LO_CLANG_CC])
             else
                 AC_MSG_RESULT([no])
             fi
         else
-            AC_CHECK_PROG(CLANG_CC,clang,clang,[])
-            AC_CHECK_PROG(CLANG_CXX,clang++,clang++,[])
+            AC_CHECK_PROG(LO_CLANG_CC,clang,clang,[])
+            AC_CHECK_PROG(LO_CLANG_CXX,clang++,clang++,[])
         fi
     fi
-    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'`
+    if test -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then
+        clang2_version=`echo __clang_major__.__clang_minor__.__clang_patchlevel__ | $LO_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_CC=
-            CLANG_CXX=
+            LO_CLANG_CC=
+            LO_CLANG_CXX=
         fi
     fi
-    if test -z "$CLANG_CC" -o -z "$CLANG_CXX"; then
+    if test -z "$LO_CLANG_CC" -o -z "$LO_CLANG_CXX"; then
         # Skia is the default on Windows, so hard-require Clang.
         # Elsewhere it's used just by the 'gen' VCL backend which is rarely used.
         if test "$_os" = "WINNT"; then
@@ -11645,7 +11645,7 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT
     else
 
         save_CXX="$CXX"
-        CXX="$CLANG_CXX"
+        CXX="$LO_CLANG_CXX"
         # copy&paste (and adjust) of intrinsics checks, since MSVC's -arch doesn't work well for Clang-cl
         flag_sse2=-msse2
         flag_ssse3=-mssse3
@@ -11675,7 +11675,7 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT
         CXXFLAGS=$save_CXXFLAGS
         AC_MSG_RESULT([${can_compile_sse2}])
         if test "${can_compile_sse2}" = "yes" ; then
-            CLANG_CXXFLAGS_INTRINSICS_SSE2="$flag_sse2"
+            LO_CLANG_CXXFLAGS_INTRINSICS_SSE2="$flag_sse2"
         fi
 
         AC_MSG_CHECKING([whether $CXX can compile SSSE3 intrinsics])
@@ -11696,7 +11696,7 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT
         CXXFLAGS=$save_CXXFLAGS
         AC_MSG_RESULT([${can_compile_ssse3}])
         if test "${can_compile_ssse3}" = "yes" ; then
-            CLANG_CXXFLAGS_INTRINSICS_SSSE3="$flag_ssse3"
+            LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3="$flag_ssse3"
         fi
 
         AC_MSG_CHECKING([whether $CXX can compile SSE4.1 intrinsics])
@@ -11717,7 +11717,7 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT
         CXXFLAGS=$save_CXXFLAGS
         AC_MSG_RESULT([${can_compile_sse41}])
         if test "${can_compile_sse41}" = "yes" ; then
-            CLANG_CXXFLAGS_INTRINSICS_SSE41="$flag_sse41"
+            LO_CLANG_CXXFLAGS_INTRINSICS_SSE41="$flag_sse41"
         fi
 
         AC_MSG_CHECKING([whether $CXX can compile SSE4.2 intrinsics])
@@ -11738,7 +11738,7 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT
         CXXFLAGS=$save_CXXFLAGS
         AC_MSG_RESULT([${can_compile_sse42}])
         if test "${can_compile_sse42}" = "yes" ; then
-            CLANG_CXXFLAGS_INTRINSICS_SSE42="$flag_sse42"
+            LO_CLANG_CXXFLAGS_INTRINSICS_SSE42="$flag_sse42"
         fi
 
         AC_MSG_CHECKING([whether $CXX can compile AVX intrinsics])
@@ -11759,7 +11759,7 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT
         CXXFLAGS=$save_CXXFLAGS
         AC_MSG_RESULT([${can_compile_avx}])
         if test "${can_compile_avx}" = "yes" ; then
-            CLANG_CXXFLAGS_INTRINSICS_AVX="$flag_avx"
+            LO_CLANG_CXXFLAGS_INTRINSICS_AVX="$flag_avx"
         fi
 
         AC_MSG_CHECKING([whether $CXX can compile AVX2 intrinsics])
@@ -11780,7 +11780,7 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT
         CXXFLAGS=$save_CXXFLAGS
         AC_MSG_RESULT([${can_compile_avx2}])
         if test "${can_compile_avx2}" = "yes" ; then
-            CLANG_CXXFLAGS_INTRINSICS_AVX2="$flag_avx2"
+            LO_CLANG_CXXFLAGS_INTRINSICS_AVX2="$flag_avx2"
         fi
 
         AC_MSG_CHECKING([whether $CXX can compile AVX512 intrinsics])
@@ -11800,7 +11800,7 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT
         CXXFLAGS=$save_CXXFLAGS
         AC_MSG_RESULT([${can_compile_avx512}])
         if test "${can_compile_avx512}" = "yes" ; then
-            CLANG_CXXFLAGS_INTRINSICS_AVX512="$flag_avx512"
+            LO_CLANG_CXXFLAGS_INTRINSICS_AVX512="$flag_avx512"
         fi
 
         AC_MSG_CHECKING([whether $CXX can compile F16C intrinsics])
@@ -11822,7 +11822,7 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT
         CXXFLAGS=$save_CXXFLAGS
         AC_MSG_RESULT([${can_compile_f16c}])
         if test "${can_compile_f16c}" = "yes" ; then
-            CLANG_CXXFLAGS_INTRINSICS_F16C="$flag_f16c"
+            LO_CLANG_CXXFLAGS_INTRINSICS_F16C="$flag_f16c"
         fi
 
         AC_MSG_CHECKING([whether $CXX can compile FMA intrinsics])
@@ -11843,20 +11843,20 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT
         CXXFLAGS=$save_CXXFLAGS
         AC_MSG_RESULT([${can_compile_fma}])
         if test "${can_compile_fma}" = "yes" ; then
-            CLANG_CXXFLAGS_INTRINSICS_FMA="$flag_fma"
+            LO_CLANG_CXXFLAGS_INTRINSICS_FMA="$flag_fma"
         fi
 
         CXX="$save_CXX"
     fi
 fi
 #
-# prefix CLANG_CC/CLANG_CXX with ccache if needed
+# prefix LO_CLANG_CC/LO_CLANG_CXX with ccache if needed
 #
-if test "$CCACHE" != "" -a -n "$CLANG_CC" -a -n "$CLANG_CXX"; then
-    AC_MSG_CHECKING([whether $CLANG_CC is already ccached])
+if test "$CCACHE" != "" -a -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then
+    AC_MSG_CHECKING([whether $LO_CLANG_CC is already ccached])
     AC_LANG_PUSH([C])
     save_CC="$CC"
-    CC="$CLANG_CC"
+    CC="$LO_CLANG_CC"
     save_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS --ccache-skip -O2"
     dnl an empty program will do, we're checking the compiler flags
@@ -11865,17 +11865,17 @@ if test "$CCACHE" != "" -a -n "$CLANG_CC" -a -n "$CLANG_CXX"; then
     if test $use_ccache = yes; then
         AC_MSG_RESULT([yes])
     else
-        CLANG_CC="$CCACHE $CLANG_CC"
+        LO_CLANG_CC="$CCACHE $LO_CLANG_CC"
         AC_MSG_RESULT([no])
     fi
     CFLAGS=$save_CFLAGS
     CC=$save_CC
     AC_LANG_POP([C])
 
-    AC_MSG_CHECKING([whether $CLANG_CXX is already ccached])
+    AC_MSG_CHECKING([whether $LO_CLANG_CXX is already ccached])
     AC_LANG_PUSH([C++])
     save_CXX="$CXX"
-    CXX="$CLANG_CXX"
+    CXX="$LO_CLANG_CXX"
     save_CXXFLAGS=$CXXFLAGS
     CXXFLAGS="$CXXFLAGS --ccache-skip -O2"
     dnl an empty program will do, we're checking the compiler flags
@@ -11884,7 +11884,7 @@ if test "$CCACHE" != "" -a -n "$CLANG_CC" -a -n "$CLANG_CXX"; then
     if test $use_ccache = yes; then
         AC_MSG_RESULT([yes])
     else
-        CLANG_CXX="$CCACHE $CLANG_CXX"
+        LO_CLANG_CXX="$CCACHE $LO_CLANG_CXX"
         AC_MSG_RESULT([no])
     fi
     CXXFLAGS=$save_CXXFLAGS
@@ -11892,17 +11892,17 @@ if test "$CCACHE" != "" -a -n "$CLANG_CC" -a -n "$CLANG_CXX"; then
     AC_LANG_POP([C++])
 fi
 
-AC_SUBST(CLANG_CC)
-AC_SUBST(CLANG_CXX)
-AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_SSE2)
-AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_SSSE3)
-AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_SSE41)
-AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_SSE42)
-AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_AVX)
-AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_AVX2)
-AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_AVX512)
-AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_F16C)
-AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_FMA)
+AC_SUBST(LO_CLANG_CC)
+AC_SUBST(LO_CLANG_CXX)
+AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_SSE2)
+AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3)
+AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_SSE41)
+AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_SSE42)
+AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_AVX)
+AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_AVX2)
+AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_AVX512)
+AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_F16C)
+AC_SUBST(LO_CLANG_CXXFLAGS_INTRINSICS_FMA)
 AC_SUBST(CLANG_USE_LD)
 
 SYSTEM_GPGMEPP=
diff --git a/extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/project.pbxproj b/extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/project.pbxproj
index f086d7ec93ca..a577eeb1d70f 100644
--- a/extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/project.pbxproj
+++ b/extensions/source/macosx/spotlight/SpotlightImporterTester/SpotlightImporterTester.xcodeproj/project.pbxproj
@@ -160,8 +160,8 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
+				LO_CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				LO_CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
@@ -218,8 +218,8 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
+				LO_CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				LO_CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk
index 8abfdec063db..77f1b29dc00a 100644
--- a/external/libpng/StaticLibrary_libpng.mk
+++ b/external/libpng/StaticLibrary_libpng.mk
@@ -46,14 +46,14 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\
 
 # At least on Linux, with --enable-lto, when building both this external/libpng and external/skia,
 # and building with GCC but building skia with Clang (which should be the sole combination that
-# matches "CLANG_CC is non-empty"), build this as a fat archive (including both the intermediate GCC
+# matches "LO_CLANG_CC is non-empty"), build this as a fat archive (including both the intermediate GCC
 # object code for LTO and machine object code).  Besides targets like Library_vcl (which benefit
 # from the  intermediate GCC object code for LTO), also Library_skia (built with the Clang toolchain
 # lld, which does not understand intermediate GCC object code) includes this, so would otherwise
 # fail to link (but now does not benefit from LTO for this included StaticLibrary_libpng):
 ifeq ($(OS)-$(ENABLE_LTO),LINUX-TRUE)
 ifneq ($(filter SKIA,$(BUILD_TYPE)),)
-ifneq ($(CLANG_CC),)
+ifneq ($(LO_CLANG_CC),)
 $(eval $(call gb_StaticLibrary_add_cflags,libpng,-ffat-lto-objects))
 endif
 endif
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 643c41a4ce38..ec2d2a3f3f45 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -100,7 +100,7 @@ $(eval $(call gb_Library_add_exception_objects,skia,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,skia,\
-    external/skia/source/skia_opts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) $(CLANG_CXXFLAGS_INTRINSICS_SSSE3) \
+    external/skia/source/skia_opts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) $(LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3) \
 ))
 
 $(eval $(call gb_Library_set_generated_cxx_suffix,skia,cpp))
@@ -793,28 +793,28 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/opts/SkOpts_avx, $(CXXFLAGS_INTRINSICS_AVX) $(CLANG_CXXFLAGS_INTRINSICS_AVX) \
+    UnpackedTarball/skia/src/opts/SkOpts_avx, $(CXXFLAGS_INTRINSICS_AVX) $(LO_CLANG_CXXFLAGS_INTRINSICS_AVX) \
 ))
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/opts/SkOpts_hsw, \
         $(CXXFLAGS_INTRINSICS_AVX2) $(CXXFLAGS_INTRINSICS_F16C) $(CXXFLAGS_INTRINSICS_FMA) \
-        $(CLANG_CXXFLAGS_INTRINSICS_AVX2) $(CLANG_CXXFLAGS_INTRINSICS_F16C) $(CLANG_CXXFLAGS_INTRINSICS_FMA) \
+        $(LO_CLANG_CXXFLAGS_INTRINSICS_AVX2) $(LO_CLANG_CXXFLAGS_INTRINSICS_F16C) $(LO_CLANG_CXXFLAGS_INTRINSICS_FMA) \
 ))
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/opts/SkOpts_sse41, $(CXXFLAGS_INTRINSICS_SSE41) $(CLANG_CXXFLAGS_INTRINSICS_SSE41) \
+    UnpackedTarball/skia/src/opts/SkOpts_sse41, $(CXXFLAGS_INTRINSICS_SSE41) $(LO_CLANG_CXXFLAGS_INTRINSICS_SSE41) \
 ))
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/opts/SkOpts_sse42, $(CXXFLAGS_INTRINSICS_SSE42) $(CLANG_CXXFLAGS_INTRINSICS_SSE42) \
+    UnpackedTarball/skia/src/opts/SkOpts_sse42, $(CXXFLAGS_INTRINSICS_SSE42) $(LO_CLANG_CXXFLAGS_INTRINSICS_SSE42) \
 ))
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/opts/SkOpts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) $(CLANG_CXXFLAGS_INTRINSICS_SSSE3) \
+    UnpackedTarball/skia/src/opts/SkOpts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) $(LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3) \
 ))
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/opts/SkOpts_crc32 \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/opts/SkOpts_skx, $(CXXFLAGS_INTRINSICS_AVX512)  $(CLANG_CXXFLAGS_INTRINSICS_AVX512)\
+    UnpackedTarball/skia/src/opts/SkOpts_skx, $(CXXFLAGS_INTRINSICS_AVX512)  $(LO_CLANG_CXXFLAGS_INTRINSICS_AVX512)\
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 819a419620b5..f1de19fdd9ec 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -409,8 +409,8 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
+				LO_CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				LO_CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_OPTIMIZATION_PROFILE_FILE = "$(SRCROOT)/../../workdir/CustomTarget/ios/$(PROJECT_NAME).profdata";
@@ -478,8 +478,8 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
+				LO_CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				LO_CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_OPTIMIZATION_PROFILE_FILE = "$(SRCROOT)/../../workdir/CustomTarget/ios/$(PROJECT_NAME).profdata";
diff --git a/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj b/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj
index a924640b500a..398007d9d2b8 100644
--- a/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj
+++ b/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj
@@ -599,8 +599,8 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
+				LO_CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				LO_CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
@@ -658,8 +658,8 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
+				LO_CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				LO_CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
@@ -709,7 +709,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				LO_CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = J4FQ687VJK;
 				ENABLE_BITCODE = NO;
@@ -749,7 +749,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				LO_CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = J4FQ687VJK;
 				ENABLE_BITCODE = NO;
diff --git a/osx/soffice.xcodeproj/project.pbxproj b/osx/soffice.xcodeproj/project.pbxproj
index 42f20e8847ea..f67dc0577ed1 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -1785,8 +1785,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
+				LO_CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				LO_CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -1822,8 +1822,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
+				LO_CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				LO_CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 98c88a74616b..6cd8719f91b7 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1624,7 +1624,7 @@ endef
 # function to set it manually. This variant should be used if gb_LinkTarget_use_clang is used.
 # call gb_LinkTarget_set_clang_precompiled_header,linktarget,pchcxxfile,,linktargetmakefilename
 define gb_LinkTarget_set_clang_precompiled_header
-$(call gb_LinkTarget_set_precompiled_header,$(1),$(2),$(3),$(4),$(CLANG_CXX))
+$(call gb_LinkTarget_set_precompiled_header,$(1),$(2),$(3),$(4),$(LO_CLANG_CXX))
 
 endef
 
@@ -1783,8 +1783,8 @@ 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_CC := $(CLANG_CC)
-$(call gb_LinkTarget_get_target,$(1)) : T_CXX := $(CLANG_CXX)
+$(call gb_LinkTarget_get_target,$(1)) : T_CC := $(LO_CLANG_CC)
+$(call gb_LinkTarget_get_target,$(1)) : T_CXX := $(LO_CLANG_CXX)
 $(call gb_LinkTarget_get_target,$(1)) : T_USE_LD := $(or $(CLANG_USE_LD),$(USE_LD))
 
 endef