diff options
Diffstat (limited to 'compiler_wrapper/ccache_flag.go')
| -rw-r--r-- | compiler_wrapper/ccache_flag.go | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/compiler_wrapper/ccache_flag.go b/compiler_wrapper/ccache_flag.go index 312d0f02..265b8fc2 100644 --- a/compiler_wrapper/ccache_flag.go +++ b/compiler_wrapper/ccache_flag.go @@ -4,7 +4,7 @@ package main -func processCCacheFlag(sysroot string, builder *commandBuilder) { +func processCCacheFlag(builder *commandBuilder) { // We should be able to share the objects across compilers as // the pre-processed output will differ. This allows boards // that share compiler flags (like x86 boards) to share caches. @@ -20,24 +20,8 @@ func processCCacheFlag(sysroot string, builder *commandBuilder) { }) if builder.cfg.useCCache && useCCache { - // We need to get ccache to make relative paths from within the - // sysroot. This lets us share cached files across boards (if - // all other things are equal of course like CFLAGS) as well as - // across versions. A quick test is something like: - // $ export CFLAGS='-O2 -g -pipe' CXXFLAGS='-O2 -g -pipe' - // $ BOARD=x86-alex - // $ cros_workon-$BOARD stop cros-disks - // $ emerge-$BOARD cros-disks - // $ cros_workon-$BOARD start cros-disks - // $ emerge-$BOARD cros-disks - // $ BOARD=amd64-generic - // $ cros_workon-$BOARD stop cros-disks - // $ emerge-$BOARD cros-disks - // $ cros_workon-$BOARD start cros-disks - // $ emerge-$BOARD cros-disks - // All of those will get cache hits (ignoring the first one - // which will seed the cache) due to this setting. - builder.updateEnv("CCACHE_BASEDIR=" + sysroot) + // Note: we used to also set CCACHE_BASEDIR but don't do it + // anymore for reasons outlined in crrev.com/c/2103170. if _, present := builder.env.getenv("CCACHE_DISABLE"); present { // Portage likes to set this for us when it has FEATURES=-ccache. // The other vars we need to setup manually because of tools like |