[llvm] a4425cc - [ccache] Add Windows support
Stella Stamenova via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 1 11:35:38 PDT 2022
Author: Nathaniel McVicar
Date: 2022-06-01T11:34:56-07:00
New Revision: a4425cc9146059618b3b7e927639b60a7c3301bc
URL: https://github.com/llvm/llvm-project/commit/a4425cc9146059618b3b7e927639b60a7c3301bc
DIFF: https://github.com/llvm/llvm-project/commit/a4425cc9146059618b3b7e927639b60a7c3301bc.diff
LOG: [ccache] Add Windows support
Windows builds can't receive environment variables on the command line or make use of RULE_LAUNCH_COMPILE with ccache.
Reviewed By: stella.stamenova, Ericson2314
Differential Revision: https://reviews.llvm.org/D126575
Added:
Modified:
llvm/CMakeLists.txt
Removed:
################################################################################
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index 8bf51d4d544f..12aea913db32 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -173,11 +173,12 @@ set(LLVM_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache enabled build")
if(LLVM_CCACHE_BUILD)
find_program(CCACHE_PROGRAM ccache)
if(CCACHE_PROGRAM)
- set(LLVM_CCACHE_MAXSIZE "" CACHE STRING "Size of ccache")
- set(LLVM_CCACHE_DIR "" CACHE STRING "Directory to keep ccached data")
- set(LLVM_CCACHE_PARAMS "CCACHE_CPP2=yes CCACHE_HASHDIR=yes"
- CACHE STRING "Parameters to pass through to ccache")
+ set(LLVM_CCACHE_MAXSIZE "" CACHE STRING "Size of ccache")
+ set(LLVM_CCACHE_DIR "" CACHE STRING "Directory to keep ccached data")
+ set(LLVM_CCACHE_PARAMS "CCACHE_CPP2=yes CCACHE_HASHDIR=yes"
+ CACHE STRING "Parameters to pass through to ccache")
+ if(NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
set(CCACHE_PROGRAM "${LLVM_CCACHE_PARAMS} ${CCACHE_PROGRAM}")
if (LLVM_CCACHE_MAXSIZE)
set(CCACHE_PROGRAM "CCACHE_MAXSIZE=${LLVM_CCACHE_MAXSIZE} ${CCACHE_PROGRAM}")
@@ -186,6 +187,16 @@ if(LLVM_CCACHE_BUILD)
set(CCACHE_PROGRAM "CCACHE_DIR=${LLVM_CCACHE_DIR} ${CCACHE_PROGRAM}")
endif()
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_PROGRAM})
+ else()
+ if(LLVM_CCACHE_MAXSIZE OR LLVM_CCACHE_DIR OR
+ NOT LLVM_CCACHE_PARAMS MATCHES "CCACHE_CPP2=yes CCACHE_HASHDIR=yes")
+ message(FATAL_ERROR "Ccache configuration through CMake is not supported on Windows. Please use environment variables.")
+ endif()
+ # RULE_LAUNCH_COMPILE should work with Ninja but currently has issues
+ # with cmd.exe and some MSVC tools other than cl.exe
+ set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
+ set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
+ endif()
else()
message(FATAL_ERROR "Unable to find the program ccache. Set LLVM_CCACHE_BUILD to OFF")
endif()
More information about the llvm-commits
mailing list