diff options
| author | Ross Burton <ross.burton@intel.com> | 2017-07-10 16:31:31 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-17 14:01:36 +0100 |
| commit | c895ddb56b18bbc500842775aa98d052dbbdd909 (patch) | |
| tree | acae3e132b725f234000cad8a8015562a23895b6 /meta/conf | |
| parent | 8839ed1620c80f3c4a806c096e97d25c68d6d64e (diff) | |
| download | poky-c895ddb56b18bbc500842775aa98d052dbbdd909.tar.gz | |
ccache: don't export CCACHE_DISABLE globally
CCACHE_DISABLE was added to bitbake.conf in oe-core dd2bab (June 2012) because
autogen-native exports HOME=/dev/null during the build, which is then used by a
host ccache to construct the path to it's cache (/dev/null/.ccache) and this
fails.
However we now always export CCACHE_DIR to solve the same problem in a more
efficient way so CCACHE_DISABLE can be deleted.
(From OE-Core rev: ef33a3138384667f819688141086102e6e83ec44)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 5 |
1 files changed, 1 insertions, 4 deletions
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 \ |