diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
index 8a65693fea2..284912c19c1 100644
--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
@@ -651,8 +651,8 @@ function(configure_lit_site_cfg input output)
   set(HOST_OS ${CMAKE_SYSTEM_NAME})
   set(HOST_ARCH ${CMAKE_SYSTEM_PROCESSOR})
 
-  set(HOST_CC "${CMAKE_C_COMPILER}")
-  set(HOST_CXX "${CMAKE_CXX_COMPILER}")
+  set(HOST_CC "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}")
+  set(HOST_CXX "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}")
 
   configure_file(${input} ${output} @ONLY)
 endfunction()
diff --git a/test/Bindings/Go/lit.local.cfg b/test/Bindings/Go/lit.local.cfg
index c41ff16b287..f366397a2b2 100644
--- a/test/Bindings/Go/lit.local.cfg
+++ b/test/Bindings/Go/lit.local.cfg
@@ -29,8 +29,13 @@ def find_executable(executable, path=None):
 # This is a Go-specific hack. cgo and other Go tools check $CC and $CXX for the
 # substring 'clang' to determine if the compiler is Clang. This won't work if
 # $CC is cc and cc is a symlink pointing to clang, as it is on Darwin.
+#
+# Go tools also have problems with ccache, so we disable it.
 def fixup_compiler_path(compiler):
     args = shlex.split(compiler)
+    if args[0].endswith('ccache'):
+        args = args[1:]
+
     path = find_executable(args[0])
 
     try: