commit 0ce72c458c5aa7f08e601ff7c33d8a2bc398a7bf
author Ying Wang <wangying@google.com> Sun Oct 10 09:10:22 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Oct 10 09:10:22 2010 -0700
tree 2e106f65ffcba42b472240d41587808db6a5df95
parent d25cc67e4a788c4b3e7c45f8c984e18e72799698
parent 3b008f36956c35f58d510ad3da5090cf21a08349

am 3b008f36: am 83f69eb5: Prepend ccache to CC/CXX if necessary.

Merge commit '3b008f36956c35f58d510ad3da5090cf21a08349'

* commit '3b008f36956c35f58d510ad3da5090cf21a08349':
  Prepend ccache to CC/CXX if necessary.

core/combo/select.mk

diff --git a/core/combo/select.mk b/core/combo/select.mk
index bd6c8c0..c886342 100644
--- a/core/combo/select.mk
+++ b/core/combo/select.mk
@@ -51,7 +51,7 @@
 $(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
@@ -63,7 +63,12 @@
 
 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