[llvm] r220071 - Disable ccache for go tests.

[Peter Collingbourne]

Author: pcc
Date: Fri Oct 17 13:32:36 2014
New Revision: 220071

URL: http://llvm.org/viewvc/llvm-project?rev=220071&view=rev
Log:
Disable ccache for go tests.

Should fix llvm-clang-lld-x86_64-debian-fast bot.

Modified:
    llvm/trunk/cmake/modules/AddLLVM.cmake
    llvm/trunk/test/Bindings/Go/lit.local.cfg

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=220071&r1=220070&r2=220071&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Fri Oct 17 13:32:36 2014
@@ -651,8 +651,8 @@ function(configure_lit_site_cfg input ou
   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()

Modified: llvm/trunk/test/Bindings/Go/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Go/lit.local.cfg?rev=220071&r1=220070&r2=220071&view=diff
==============================================================================
--- llvm/trunk/test/Bindings/Go/lit.local.cfg (original)
+++ llvm/trunk/test/Bindings/Go/lit.local.cfg Fri Oct 17 13:32:36 2014
@@ -29,8 +29,13 @@ def find_executable(executable, path=Non
 # 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: