| commit | d0f0918b8fa2a1794050a3cecf3ad3943ad378ab | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Jun 06 18:21:09 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jun 06 18:21:09 2014 +0000 |
| tree | 80a5e0d6c7461b8afd0ad78375e5211924d15a88 | |
| parent | e564c0cbd08c728d84e62308c741b30f3bd542f8 [diff] | |
| parent | 67ed25f3a648a7d688a57a57da75eaf4881d4e46 [diff] |
Merge "Reenable ccache."
diff --git a/core/combo/select.mk b/core/combo/select.mk index 98697e0..e18cb1b 100644 --- a/core/combo/select.mk +++ b/core/combo/select.mk
@@ -92,8 +92,12 @@ # Check that the executable is here. ccache := $(strip $(wildcard $(ccache))) ifdef ccache - CC_WRAPPER ?= $(ccache) - CXX_WRAPPER ?= $(ccache) + ifndef CC_WRAPPER + CC_WRAPPER := $(ccache) + endif + ifndef CXX_WRAPPER + CXX_WRAPPER := $(ccache) + endif ccache = endif endif