am d0f0918b: Merge "Reenable ccache."

* commit 'd0f0918b8fa2a1794050a3cecf3ad3943ad378ab': Reenable ccache.
2014-06-06 18:24:31 +00:00
parent 3c52ff0714 d0f0918b8f
commit 3fe9a277fe
1 changed files with 6 additions and 2 deletions
--- 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