From: mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 5 Mar 2011 16:31:37 +0000 (+0000)
Subject: Backport r25878 to backfire
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=8b343d82f19ecf90636ff65b1cb030bf21203de2

Backport r25878 to backfire


git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25879 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/include/cmake.mk b/include/cmake.mk
index 09a0a2419..c83be1522 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -2,6 +2,18 @@ PKG_INSTALL:=1
 
 MAKE_FLAGS+=VERBOSE=1
 
+ifeq ($(CONFIG_CCACHE),)
+  CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)
+  CMAKE_C_COMPILER_ARG1:=
+  CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)
+  CMAKE_CXX_COMPILER_ARG1:=
+else
+  CMAKE_C_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache
+  CMAKE_C_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CC))
+  CMAKE_CXX_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache
+  CMAKE_CXX_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CXX))
+endif
+
 define Build/Configure/Default
 	(cd $(PKG_BUILD_DIR); \
 		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
@@ -13,8 +25,10 @@ define Build/Configure/Default
 			-DCMAKE_BUILD_TYPE=Release \
 			-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
 			-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
-			-DCMAKE_C_COMPILER=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC) \
-			-DCMAKE_CXX_COMPILER=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX) \
+			-DCMAKE_C_COMPILER="$(CMAKE_C_COMPILER)" \
+			-DCMAKE_C_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \
+			-DCMAKE_CXX_COMPILER="$(CMAKE_CXX_COMPILER)" \
+			-DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CXX_COMPILER_ARG1)" \
 			-DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
 			-DCMAKE_MODULE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
 			-DCMAKE_SHARED_LINKER_FLAGS="$(TARGET_LDFLAGS)" \