From: nbd Date: Tue, 15 Mar 2011 19:58:32 +0000 (+0000) Subject: build: move the CCACHE_DIR to the build targets so that it doesn't interfere with... X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/63c3f4a351d974754dd590798c5bc63fba1aa770 build: move the CCACHE_DIR to the build targets so that it doesn't interfere with a host ccache setup git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26181 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/include/package.mk b/include/package.mk index 1cf4d64cc..2ebd66d11 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 c2b0dcaff..2d56c436e 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