diff options
| author | Space Meyer <spm@google.com> | 2023-01-06 12:50:26 +0100 |
|---|---|---|
| committer | Space Meyer <git@the-space.agency> | 2023-01-09 14:25:36 +0100 |
| commit | df3838a1b408f22e5df7cd986138d6ec5768369d (patch) | |
| tree | bddc682c0d599008033f4a3a3e8d8340c4796d91 /syz-ci/jobs.go | |
| parent | 1dac8c7a01e2bdd35cb04eb4901ddb157291ac2d (diff) | |
syz-ci/jobs: use linker supplied in syz-ci config
Previously we only used the linter from the syz-ci config when building
the kernel for regular fuzzing. We were missing some plumbing to have
this setting reach patch testing and bisection jobs.
Diffstat (limited to 'syz-ci/jobs.go')
| -rw-r--r-- | syz-ci/jobs.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go index 588c3df2b..8a157ed75 100644 --- a/syz-ci/jobs.go +++ b/syz-ci/jobs.go @@ -417,6 +417,7 @@ func (jp *JobProcessor) bisect(job *Job, mgrcfg *mgrconfig.Config) error { DefaultCompiler: mgr.mgrcfg.Compiler, CompilerType: mgr.mgrcfg.CompilerType, BinDir: jp.cfg.BisectBinDir, + Linker: mgr.mgrcfg.Linker, Ccache: jp.cfg.Ccache, Kernel: bisect.KernelConfig{ Repo: mgr.mgrcfg.Repo, @@ -552,8 +553,8 @@ func (jp *JobProcessor) testPatch(job *Job, mgrcfg *mgrconfig.Config) error { []byte("# CONFIG_DEBUG_INFO_BTF is not set"), -1) log.Logf(0, "job: building kernel...") - kernelConfig, details, err := env.BuildKernel(mgr.mgrcfg.Compiler, mgr.mgrcfg.Ccache, mgr.mgrcfg.Userspace, - mgr.mgrcfg.KernelCmdline, mgr.mgrcfg.KernelSysctl, req.KernelConfig) + kernelConfig, details, err := env.BuildKernel(mgr.mgrcfg.Compiler, mgr.mgrcfg.Linker, mgr.mgrcfg.Ccache, + mgr.mgrcfg.Userspace, mgr.mgrcfg.KernelCmdline, mgr.mgrcfg.KernelSysctl, req.KernelConfig) resp.Build.CompilerID = details.CompilerID if err != nil { return err |