Commit 2ef8b444 authored by Kevin Modzelewski's avatar Kevin Modzelewski

Have to set CCACHE_CPP2=yes to work around some clang+ccache issues

parent 1642b630
......@@ -28,7 +28,7 @@ if(ENABLE_CCACHE)
find_program(CCACHE ccache)
if(CCACHE)
message(STATUS "found ccache ${CCACHE}")
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "CCACHE_CPP2=yes ${CCACHE}")
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE})
endif()
endif()
......
......@@ -249,6 +249,8 @@ ifeq ($(USE_CCACHE),1)
CXX := ccache $(CXX)
CXX_PROFILE := ccache $(CXX_PROFILE)
CLANG_CXX := ccache $(CLANG_CXX)
CXX_ENV += CCACHE_CPP2=yes
CC_ENV += CCACHE_CPP2=yes
ifeq ($(USE_DISTCC),1)
CXX_ENV += CCACHE_PREFIX=distcc
endif
......@@ -266,6 +268,7 @@ ifeq ($(USE_CCACHE),1)
endif
CXX := $(CXX_ENV) $(CXX)
CXX_PROFILE := $(CXX_ENV) $(CXX_PROFILE)
CC := $(CC_ENV) $(CC)
CLANG_CXX := $(CXX_ENV) $(CLANG_CXX)
# Not sure if ccache_basedir actually helps at all (I think the generated files make them different?)
LLVM_BUILD_ENV += CCACHE_DIR=$(HOME)/.ccache_llvm CCACHE_BASEDIR=$(LLVM_SRC)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment