From 2e5c6a5c1c62461b69c6f50a123885b9910fce04 Mon Sep 17 00:00:00 2001 From: Florent Revest Date: Wed, 2 Oct 2024 15:25:51 +0200 Subject: pkg/build/linux: support building with a custom make binary Certain environments might need a specific make command or wrap make calls with extra logic. This lets users provide a path to a custom make binary. --- syz-ci/jobs.go | 1 + syz-ci/manager.go | 1 + syz-ci/syz-ci.go | 1 + 3 files changed, 3 insertions(+) (limited to 'syz-ci') diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go index 566ed7a67..91ef57f6b 100644 --- a/syz-ci/jobs.go +++ b/syz-ci/jobs.go @@ -645,6 +645,7 @@ func (jp *JobProcessor) testPatch(job *Job, mgrcfg *mgrconfig.Config) error { log.Logf(0, "job: building kernel...") kernelConfig, details, err := env.BuildKernel(&instance.BuildKernelConfig{ CompilerBin: mgr.mgrcfg.Compiler, + MakeBin: mgr.mgrcfg.Make, LinkerBin: mgr.mgrcfg.Linker, CcacheBin: mgr.mgrcfg.Ccache, UserspaceDir: mgr.mgrcfg.Userspace, diff --git a/syz-ci/manager.go b/syz-ci/manager.go index fd19a8780..872825c34 100644 --- a/syz-ci/manager.go +++ b/syz-ci/manager.go @@ -370,6 +370,7 @@ func (mgr *Manager) build(kernelCommit *vcs.Commit) error { VMType: mgr.managercfg.Type, KernelDir: mgr.kernelBuildDir, OutputDir: tmpDir, + Make: mgr.mgrcfg.Make, Compiler: mgr.mgrcfg.Compiler, Linker: mgr.mgrcfg.Linker, Ccache: mgr.mgrcfg.Ccache, diff --git a/syz-ci/syz-ci.go b/syz-ci/syz-ci.go index a4acc8876..b8b358652 100644 --- a/syz-ci/syz-ci.go +++ b/syz-ci/syz-ci.go @@ -191,6 +191,7 @@ type ManagerConfig struct { // explicit plumbing for every os/compiler combination. CompilerType string `json:"compiler_type"` // Defaults to "gcc" Compiler string `json:"compiler"` + Make string `json:"make"` Linker string `json:"linker"` Ccache string `json:"ccache"` Userspace string `json:"userspace"` -- cgit mrf-deployment