aboutsummaryrefslogtreecommitdiff
path: root/package/ccache
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2017-07-06 12:48:41 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2017-07-08 20:32:04 +0200
commitbdca0d05816fec8472b1d32301f55df152b86466 (patch)
tree08f29353452f27eb431a477edde5fea26a65bf00 /package/ccache
parente861b972bbfdb58e69a6f52705144b37235ed225 (diff)
downloadbuildroot-bdca0d05816fec8472b1d32301f55df152b86466.tar.gz
buildroot-bdca0d05816fec8472b1d32301f55df152b86466.tar.bz2
ccache: make default host-ccache cache dir fit for multi-user setups
While building I noticed: >>> host-ccache 3.3.4 Building conf.c: In function 'conf_create': conf.c:314:2: warning: too many arguments for format [-Wformat-extra-args] conf->cache_dir = format("/home/peko/.buildroot-ccache", get_home_directory()); ^ As host-ccache gets installed into $(HOST_DIR) and is part of the SDK, hardcoding the build user homedir isn't really nice for the relocatable SDK feature (or simply for a SDK used by multiple users). As the warning shows, CCache replaces "%s" with the current user home directory, so rewrite BR_CACHE_DIR to use this feature if it begins with $HOME. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/ccache')
-rw-r--r--package/ccache/ccache.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index 97d66bb45b..afbec44fac 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -28,9 +28,13 @@ HOST_CCACHE_CONF_OPTS += --with-bundled-zlib
# BR2_CCACHE_DIR.
# - Change hard-coded last-ditch default to match path in .config, to avoid
# the need to specify BR_CACHE_DIR when invoking ccache directly.
+# CCache replaces "%s" with the home directory of the current user,
+# So rewrite BR_CACHE_DIR to take that into consideration for SDK purpose
+HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,\%s/%,$(BR_CACHE_DIR))
+
define HOST_CCACHE_PATCH_CONFIGURATION
sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/ccache.c
- sed -i 's,"%s/.ccache","$(BR_CACHE_DIR)",' $(@D)/conf.c
+ sed -i 's,"%s/.ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/conf.c
endef
HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION