diff options
-rw-r--r-- | meta/classes/ccache.bbclass | 1 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/meta/classes/ccache.bbclass b/meta/classes/ccache.bbclass index d58c8f6e57..9f1b1f45e3 100644 --- a/meta/classes/ccache.bbclass +++ b/meta/classes/ccache.bbclass | |||
@@ -1,6 +1,5 @@ | |||
1 | CCACHE = "${@bb.utils.which(d.getVar('PATH'), 'ccache') and 'ccache '}" | 1 | CCACHE = "${@bb.utils.which(d.getVar('PATH'), 'ccache') and 'ccache '}" |
2 | export CCACHE_DIR ?= "${TMPDIR}/ccache/${MULTIMACH_TARGET_SYS}/${PN}" | 2 | export CCACHE_DIR ?= "${TMPDIR}/ccache/${MULTIMACH_TARGET_SYS}/${PN}" |
3 | CCACHE_DISABLE[unexport] = "1" | ||
4 | 3 | ||
5 | # We need to stop ccache considering the current directory or the | 4 | # We need to stop ccache considering the current directory or the |
6 | # debug-prefix-map target directory to be significant when calculating | 5 | # debug-prefix-map target directory to be significant when calculating |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 962eb437c7..042a03cbf9 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -480,9 +480,6 @@ HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo" | |||
480 | HOSTTOOLS_NONFATAL += "join nl size yes zcat" | 480 | HOSTTOOLS_NONFATAL += "join nl size yes zcat" |
481 | 481 | ||
482 | CCACHE ??= "" | 482 | CCACHE ??= "" |
483 | # Disable ccache explicitly if CCACHE is null since gcc may be a symlink | ||
484 | # of ccache some distributions (e.g., Fedora 17). | ||
485 | export CCACHE_DISABLE ??= "${@[0,1][d.getVar('CCACHE') == '']}" | ||
486 | # ccache < 3.1.10 will create CCACHE_DIR on startup even if disabled, and | 483 | # ccache < 3.1.10 will create CCACHE_DIR on startup even if disabled, and |
487 | # autogen sets HOME=/dev/null so in certain situations builds can fail. | 484 | # autogen sets HOME=/dev/null so in certain situations builds can fail. |
488 | # Explicitly export CCACHE_DIR until we can assume ccache >3.1.10 on the host. | 485 | # Explicitly export CCACHE_DIR until we can assume ccache >3.1.10 on the host. |
@@ -845,7 +842,7 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI | |||
845 | SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \ | 842 | SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \ |
846 | USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ | 843 | USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ |
847 | PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ | 844 | PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ |
848 | CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE LICENSE_PATH SDKPKGSUFFIX \ | 845 | CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE LICENSE_PATH SDKPKGSUFFIX \ |
849 | WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ | 846 | WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ |
850 | BB_WORKERCONTEXT BB_LIMITEDDEPS extend_recipe_sysroot DEPLOY_DIR" | 847 | BB_WORKERCONTEXT BB_LIMITEDDEPS extend_recipe_sysroot DEPLOY_DIR" |
851 | BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ | 848 | BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ |