diff options
Diffstat (limited to 'compiler_wrapper')
-rw-r--r-- | compiler_wrapper/ccache_flag.go | 7 | ||||
-rw-r--r-- | compiler_wrapper/ccache_flag_test.go | 13 |
2 files changed, 20 insertions, 0 deletions
diff --git a/compiler_wrapper/ccache_flag.go b/compiler_wrapper/ccache_flag.go index 265b8fc2..02fb43ac 100644 --- a/compiler_wrapper/ccache_flag.go +++ b/compiler_wrapper/ccache_flag.go @@ -19,6 +19,13 @@ func processCCacheFlag(builder *commandBuilder) { return arg.value }) + // Disable ccache during portage's src_configure phase. Using ccache here is generally a + // waste of time, since these files are very small. Experimentally, this speeds up + // configuring by ~13%. + if val, present := builder.env.getenv("EBUILD_PHASE"); present && val == "configure" { + useCCache = false + } + if builder.cfg.useCCache && useCCache { // Note: we used to also set CCACHE_BASEDIR but don't do it // anymore for reasons outlined in crrev.com/c/2103170. diff --git a/compiler_wrapper/ccache_flag_test.go b/compiler_wrapper/ccache_flag_test.go index 50205312..d6eeb926 100644 --- a/compiler_wrapper/ccache_flag_test.go +++ b/compiler_wrapper/ccache_flag_test.go @@ -174,3 +174,16 @@ func TestRusagePreventsCCache(t *testing.T) { } }) } + +func TestCcacheIsDisabledInSrcConfigure(t *testing.T) { + withCCacheEnabledTestContext(t, func(ctx *testContext) { + ctx.NoteTestWritesToUmask() + + ctx.env = append(ctx.env, "EBUILD_PHASE=configure") + cmd := ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand(gccX86_64, mainCc))) + if err := verifyPath(cmd, gccX86_64+".real"); err != nil { + t.Error(err) + } + }) +} |