summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-03-15 19:58:32 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-03-15 19:58:32 +0000
commit73c1dd947351573567541b34186aa381f6546bd8 (patch)
tree1969b3157139114703dcdd4798d32c91d3f651be
parent784d808d07e2ba15a88ee53f6f7106c0969d2d2a (diff)
downloadmaster-31e0f0ae-73c1dd947351573567541b34186aa381f6546bd8.tar.gz
master-31e0f0ae-73c1dd947351573567541b34186aa381f6546bd8.tar.bz2
master-31e0f0ae-73c1dd947351573567541b34186aa381f6546bd8.zip
build: move the CCACHE_DIR to the build targets so that it doesn't interfere with a host ccache setup
SVN-Revision: 26181
-rw-r--r--include/package.mk1
-rw-r--r--rules.mk2
2 files changed, 1 insertions, 2 deletions
diff --git a/include/package.mk b/include/package.mk
index 1cf4d64cc9..2ebd66d119 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -90,6 +90,7 @@ define Build/Exports/Default
$(1) : export CONFIG_SITE:=$$(CONFIG_SITE)
$(1) : export PKG_CONFIG_PATH:=$$(PKG_CONFIG_PATH)
$(1) : export PKG_CONFIG_LIBDIR:=$$(PKG_CONFIG_PATH)
+ $(1) : export CCACHE_DIR:=$(STAGING_DIR)/ccache
endef
Build/Exports=$(Build/Exports/Default)
diff --git a/rules.mk b/rules.mk
index c2b0dcaff9..2d56c436ed 100644
--- a/rules.mk
+++ b/rules.mk
@@ -178,8 +178,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)
TARGET_CXX:= ccache $(TARGET_CXX)
endif