diff options
| author | Jouni Hogander <jouni.hogander@unikie.com> | 2020-09-01 16:13:50 +0300 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-09-21 11:23:04 +0200 |
| commit | bbb921d248befbb1bf3970cc8d680403f255de97 (patch) | |
| tree | c3ef61c8727b2548f1fb4e80da9e3b9fe7a58b82 /tools | |
| parent | 5e8f0f25faceb9346ebfb1a31d49fb4cb0b76507 (diff) | |
pkg/bisect: add ccache option
Add option to use ccache in kernel builds.
Signed-off-by: Jouni Hogander <jouni.hoegander@partner.bmw.de>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syz-bisect/bisect.go | 2 | ||||
| -rw-r--r-- | tools/syz-testbuild/testbuild.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/syz-bisect/bisect.go b/tools/syz-bisect/bisect.go index c09d000a0..f50b29095 100644 --- a/tools/syz-bisect/bisect.go +++ b/tools/syz-bisect/bisect.go @@ -46,6 +46,7 @@ type Config struct { // gcc versions. A working archive can be downloaded from: // https://storage.googleapis.com/syzkaller/bisect_bin.tar.gz BinDir string `json:"bin_dir"` + Ccache string `json:"ccache"` KernelRepo string `json:"kernel_repo"` KernelBranch string `json:"kernel_branch"` SyzkallerRepo string `json:"syzkaller_repo"` @@ -86,6 +87,7 @@ func main() { Trace: os.Stdout, Fix: *flagFix, BinDir: mycfg.BinDir, + Ccache: mycfg.Ccache, DebugDir: *flagCrash, Kernel: bisect.KernelConfig{ Repo: mycfg.KernelRepo, diff --git a/tools/syz-testbuild/testbuild.go b/tools/syz-testbuild/testbuild.go index fd5a0fea3..f4c108a52 100644 --- a/tools/syz-testbuild/testbuild.go +++ b/tools/syz-testbuild/testbuild.go @@ -128,7 +128,7 @@ func test(repo vcs.Repo, bisecter vcs.Bisecter, kernelConfig []byte, env instanc if err := build.Clean(*flagOS, *flagArch, vmType, *flagKernelSrc); err != nil { fail(err) } - _, _, err = env.BuildKernel(bisectEnv.Compiler, *flagUserspace, + _, _, err = env.BuildKernel(bisectEnv.Compiler, "", *flagUserspace, *flagKernelCmdline, *flagKernelSysctl, bisectEnv.KernelConfig) if err != nil { if verr, ok := err.(*osutil.VerboseError); ok { |