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/binary.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/binary.mk')
| -rw-r--r-- | core/binary.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/binary.mk b/core/binary.mk index d7b2c6e..b8003d7 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -44,7 +44,9 @@ my_ldflags := $(LOCAL_LDFLAGS) my_ldlibs := $(LOCAL_LDLIBS) my_asflags := $(LOCAL_ASFLAGS) my_cc := $(LOCAL_CC) +my_cc_wrapper := $(CC_WRAPPER) my_cxx := $(LOCAL_CXX) +my_cxx_wrapper := $(CXX_WRAPPER) my_c_includes := $(LOCAL_C_INCLUDES) my_generated_sources := $(LOCAL_GENERATED_SOURCES) my_native_coverage := $(LOCAL_NATIVE_COVERAGE) @@ -226,6 +228,9 @@ ifneq ($(filter true always, $(LOCAL_FDO_SUPPORT)),) my_cflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_OPTIMIZE_CFLAGS) my_fdo_build := true endif + # Disable ccache (or other compiler wrapper). + my_cc_wrapper := + my_cxx_wrapper := endif ########################################################### @@ -336,6 +341,7 @@ ifeq ($(strip $(my_cc)),) else my_cc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)CC) endif + my_cc := $(my_cc_wrapper) $(my_cc) endif ifneq ($(LOCAL_NO_STATIC_ANALYZER),true) my_cc := $(SYNTAX_TOOLS_PREFIX)/ccc-analyzer $(my_syntax_arch) "$(my_cc)" @@ -352,6 +358,7 @@ ifeq ($(strip $(my_cxx)),) else my_cxx := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)CXX) endif + my_cxx := $(my_cxx_wrapper) $(my_cxx) endif ifneq ($(LOCAL_NO_STATIC_ANALYZER),true) my_cxx := $(SYNTAX_TOOLS_PREFIX)/cxx-analyzer $(my_syntax_arch) "$(my_cxx)" |