diff options
| author | Ying Wang <wangying@google.com> | 2010-10-07 10:45:02 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-10-07 10:45:02 -0700 |
| commit | 83f69eb5f905d47581bed141b7f5103362390339 (patch) | |
| tree | 407e1bfc1a05ccf79be0ef003c0b95e2461fedcc | |
| parent | 4477db7883dfa21aa423f29057511fdb804c46af (diff) | |
| download | build-83f69eb5f905d47581bed141b7f5103362390339.zip build-83f69eb5f905d47581bed141b7f5103362390339.tar.gz build-83f69eb5f905d47581bed141b7f5103362390339.tar.bz2 | |
Prepend ccache to CC/CXX if necessary.
In case TARGET_CC is assigned with HOST_CC (eg, simulator build),
ccache will be prepended twice before this CL.
Bug: 3069576
Change-Id: I2ee44faea3a2795cf389ad6f80e4066a02b43be9
| -rw-r--r-- | core/combo/select.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/combo/select.mk b/core/combo/select.mk index 916320b..797c573 100644 --- a/core/combo/select.mk +++ b/core/combo/select.mk @@ -50,7 +50,7 @@ $(combo_target)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing $(combo_target)GLOBAL_LDFLAGS := $(combo_target)GLOBAL_ARFLAGS := crsP -$(combo_target)EXECUTABLE_SUFFIX := +$(combo_target)EXECUTABLE_SUFFIX := $(combo_target)SHLIB_SUFFIX := .so $(combo_target)JNILIB_SUFFIX := $($(combo_target)SHLIB_SUFFIX) $(combo_target)STATIC_LIB_SUFFIX := .a @@ -62,7 +62,12 @@ include $(BUILD_COMBOS)/$(combo_target)$(combo_os_arch).mk ifneq ($(USE_CCACHE),) ccache := prebuilt/$(HOST_PREBUILT_TAG)/ccache/ccache - $(combo_target)CC := $(ccache) $($(combo_target)CC) - $(combo_target)CXX := $(ccache) $($(combo_target)CXX) + # prepend ccache if necessary + ifneq ($(ccache),$(firstword $($(combo_target)CC))) + $(combo_target)CC := $(ccache) $($(combo_target)CC) + endif + ifneq ($(ccache),$(firstword $($(combo_target)CXX))) + $(combo_target)CXX := $(ccache) $($(combo_target)CXX) + endif ccache = endif |