[PATCH v2 4/4] ccache: separate cache based on cross compile

[Anton Mikanovich <amikan@ilbers.de>]

Mixing ccache generated by cross and native compilers makes the second
run to stuck all the build.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 doc/user_manual.md     | 3 ++-
 meta/conf/bitbake.conf | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/user_manual.md b/doc/user_manual.md
index b9a0bb6..61d1390 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -1008,7 +1008,8 @@ to `local.conf`. If some package requires ccache to be always disabled,
 
 By default, ccache directory is created inside `TMPDIR`, but it can be
 adjusted by `CCACHE_TOP_DIR` variable in `local.conf`. Ccache directory
-`CCACHE_DIR` default value is `"${CCACHE_TOP_DIR}/${DISTRO}-${DISTRO_ARCH}"`,
+`CCACHE_DIR` default value is
+`"${CCACHE_TOP_DIR}/${DISTRO}-${DISTRO_ARCH}-${BUILD_HOST_ARCH}"`,
 that means caches for different distros and architectures are not overlapped.
 
 The ccache debug mode can be enabled by setting `CCACHE_DEBUG = "1"`
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 522241a..e6956c3 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -153,7 +153,7 @@ INHERIT += "${@'buildstats' if d.getVar('USE_BUILDSTATS') == '1' else ''}"
 # Default values for ccache
 USE_CCACHE ??= "0"
 CCACHE_TOP_DIR ?= "${TMPDIR}/ccache"
-CCACHE_DIR ?= "${CCACHE_TOP_DIR}/${DISTRO}-${DISTRO_ARCH}"
+CCACHE_DIR ?= "${CCACHE_TOP_DIR}/${DISTRO}-${DISTRO_ARCH}-${BUILD_HOST_ARCH}"
 CCACHE_DEBUG ?= "0"
 
 # Variables for tasks marking
-- 
2.34.1