summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2011-06-24 07:42:14 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-30 19:57:05 (GMT)
commit860eea2a580b3a652e7bd78501e16d6036283059 (patch)
treebc2fd98780ad4aa4119001efa32d54c57edd93be
parentb3847df86d093bf2f2bb27e34303f53b5bc6584e (diff)
downloadpoky-860eea2a580b3a652e7bd78501e16d6036283059.tar.gz
ccache: Set CCACHE on a per recipe basis
Set 'CCACHE_DIR' in 'bitbake.conf' and create the dirs for every package before task 'do_configure' started. [RP: Merge dirs variables into one] (From OE-Core rev: fe03f78fb0bf7d54b9472832e43764e882f918a1) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass2
-rw-r--r--meta/conf/bitbake.conf1
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 52f2316..c82dae8 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -194,7 +194,7 @@ python base_eventhandler() {
194} 194}
195 195
196addtask configure after do_unpack do_patch 196addtask configure after do_unpack do_patch
197do_configure[dirs] = "${S} ${B}" 197do_configure[dirs] = "${CCACHE_DIR} ${S} ${B}"
198do_configure[deptask] = "do_populate_sysroot" 198do_configure[deptask] = "do_populate_sysroot"
199base_do_configure() { 199base_do_configure() {
200 : 200 :
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index ff2a912..38367dd 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -386,6 +386,7 @@ export PATH
386CCACHE = "${@bb.which(bb.data.getVar('PATH', d, 1), 'ccache') and 'ccache '}" 386CCACHE = "${@bb.which(bb.data.getVar('PATH', d, 1), 'ccache') and 'ccache '}"
387TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" 387TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"
388 388
389export CCACHE_DIR = "${TMPDIR}/ccache/${HOST_SYS}/${PN}"
389export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" 390export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
390export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" 391export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
391export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" 392export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"