diff options
author | Ying Wang <wangying@google.com> | 2015-07-20 18:40:18 -0700 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2015-07-20 21:26:53 -0700 |
commit | c671a7cf5cae42b61991d9b72e53d9d8a6ace84e (patch) | |
tree | e6f56e4836ff3722e56ffcf621b11a13cd472cbc /core/combo/select.mk | |
parent | 7ac6cb804083a67d31a16b910dabfb76b30150a3 (diff) | |
download | build-c671a7cf5cae42b61991d9b72e53d9d8a6ace84e.zip build-c671a7cf5cae42b61991d9b72e53d9d8a6ace84e.tar.gz build-c671a7cf5cae42b61991d9b72e53d9d8a6ace84e.tar.bz2 |
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.
Bug: 22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
Diffstat (limited to 'core/combo/select.mk')
-rw-r--r-- | core/combo/select.mk | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/core/combo/select.mk b/core/combo/select.mk index 01f9322..df12e7e 100644 --- a/core/combo/select.mk +++ b/core/combo/select.mk @@ -47,62 +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. - export CCACHE_BASEDIR := / - - # 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 - ccache = - endif -endif - -# Stash the original values of CC and CXX so we can still use the non-wrapped -# values later. -$(combo_2nd_arch_prefix)CC_BARE := $($(combo_var_prefix)CC) -$(combo_2nd_arch_prefix)CXX_BARE := $($(combo_var_prefix)CXX) - -# 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 |