diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2015-10-23 20:23:21 +0300 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-10-27 00:45:16 +0200 |
commit | d17b74bb8d5db9cab53b39fd56532431bb15d05d (patch) | |
tree | 66b75b60e473c29748c2ba4b876e3ebd15d303fc /core/combo | |
parent | f79641157b5d206d3c7d3c5f8481dbc0915ce484 (diff) | |
download | build-d17b74bb8d5db9cab53b39fd56532431bb15d05d.zip build-d17b74bb8d5db9cab53b39fd56532431bb15d05d.tar.gz build-d17b74bb8d5db9cab53b39fd56532431bb15d05d.tar.bz2 |
Fix ccache mismerges
* ccache config has moved to a separate makefile in M
Change-Id: If1f426e647715f72c09f2339a61ac2a13121b477
Diffstat (limited to 'core/combo')
-rw-r--r-- | core/combo/select.mk | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/core/combo/select.mk b/core/combo/select.mk index 7c80c5f..df12e7e 100644 --- a/core/combo/select.mk +++ b/core/combo/select.mk @@ -47,65 +47,3 @@ $(combo_var_prefix)STATIC_LIB_SUFFIX := .a # Now include the combo for this specific target. include $(BUILD_COMBOS)/$(combo_target)$(combo_os_arch).mk - -ifneq ($(USE_CCACHE),) - # The default check uses size and modification time, causing false misses - # since the mtime depends when the repo was checked out - export CCACHE_COMPILERCHECK := content - - # See man page, optimizations to get more cache hits - # implies that __DATE__ and __TIME__ are not critical for functionality. - # Ignore include file modification time since it will depend on when - # the repo was checked out - export CCACHE_SLOPPINESS := time_macros,include_file_mtime,file_macro - - # Turn all preprocessor absolute paths into relative paths. - # Fixes absolute paths in preprocessed source due to use of -g. - # We don't really use system headers much so the rootdir is - # fine; ensures these paths are relative for all Android trees - # on a workstation. - ifeq ($(CCACHE_BASEDIR),) - export CCACHE_BASEDIR := $(ANDROID_BUILD_TOP) - endif - - # Workaround for ccache with clang. - # See http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html - export CCACHE_CPP2 := true - - CCACHE_HOST_TAG := $(HOST_PREBUILT_TAG) - # If we are cross-compiling Windows binaries on Linux - # then use the linux ccache binary instead. - ifeq ($(HOST_OS)-$(BUILD_OS),windows-linux) - CCACHE_HOST_TAG := linux-$(HOST_PREBUILT_ARCH) - endif - ccache := prebuilts/misc/$(CCACHE_HOST_TAG)/ccache/ccache - # Check that the executable is here. - ccache := $(strip $(wildcard $(ccache))) - ifdef ccache - ifndef CC_WRAPPER - CC_WRAPPER := $(ccache) - endif - ifndef CXX_WRAPPER - CXX_WRAPPER := $(ccache) - endif - ifeq ($(ANDROID_CCACHE_DIR), $(CCACHE_DIR)) - ifneq ($(ANDROID_CCACHE_SIZE),) - ACCSIZE_RESULT := $(shell $(ccache) -M$(ANDROID_CCACHE_SIZE)) - endif - endif - ccache = - ACCSIZE_RESULT = - endif -endif - -# The C/C++ compiler can be wrapped by setting the CC/CXX_WRAPPER vars. -ifdef CC_WRAPPER - ifneq ($(CC_WRAPPER),$(firstword $($(combo_var_prefix)CC))) - $(combo_var_prefix)CC := $(CC_WRAPPER) $($(combo_var_prefix)CC) - endif -endif -ifdef CXX_WRAPPER - ifneq ($(CXX_WRAPPER),$(firstword $($(combo_var_prefix)CXX))) - $(combo_var_prefix)CXX := $(CXX_WRAPPER) $($(combo_var_prefix)CXX) - endif -endif |