From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 15 Mar 2011 19:59:58 +0000 (+0000)
Subject: build: move the CCACHE_DIR to the build targets so that it doesn't interfere with... 
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=75e500e6d4953bfa682fafd5cf6c90126cf16161

build: move the CCACHE_DIR to the build targets so that it doesn't interfere with a host ccache setup (backport of r26181)

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

diff --git a/include/package.mk b/include/package.mk
index 21b3bff33..4c1d13864 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -84,6 +84,7 @@ define Build/Exports/Default
   $(1) : export CONFIG_SITE:=$$(CONFIG_SITE)
   $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR)/usr/lib/pkgconfig
   $(1) : export PKG_CONFIG_LIBDIR=$$(STAGING_DIR)/usr/lib/pkgconfig
+  $(1) : export CCACHE_DIR:=$(STAGING_DIR)/ccache
 endef
 Build/Exports=$(Build/Exports/Default)
 
diff --git a/rules.mk b/rules.mk
index 1a58c6ae5..0068350ed 100644
--- a/rules.mk
+++ b/rules.mk
@@ -174,8 +174,6 @@ INSTALL_DATA:=install -m0644
 INSTALL_CONF:=install -m0600
 
 ifneq ($(CONFIG_CCACHE),)
-  # FIXME: move this variable to a better location
-  export CCACHE_DIR=$(STAGING_DIR)/ccache
   TARGET_CC:= ccache $(TARGET_CC)
 endif