From 67ed25f3a648a7d688a57a57da75eaf4881d4e46 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Fri, 6 Jun 2014 11:17:34 -0700
Subject: [PATCH] Reenable ccache.

The previous commit 994c84fb virtually disabled ccache, due to the
deferred evaluation of CC_WRAPPER/CXX_WRAPPER.

Change-Id: Ie0d70a23a55190bd9b24b72edc9158b6976e1d5d
---
 core/combo/select.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/combo/select.mk b/core/combo/select.mk
index 98697e0266..e18cb1ba30 100644
--- a/core/combo/select.mk
+++ b/core/combo/select.mk
@@ -92,8 +92,12 @@ ifneq ($(USE_CCACHE),)
   # 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