diff options
| author | Florent Revest <revest@chromium.org> | 2024-10-02 15:25:51 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2024-10-14 19:43:42 +0000 |
| commit | 2e5c6a5c1c62461b69c6f50a123885b9910fce04 (patch) | |
| tree | f2f92dc597a90cecf52bf5435a88959632f7fd77 /syz-ci | |
| parent | 56381a3b0c5178a73a7ad714a54dab5ab47e0ffa (diff) | |
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.
Diffstat (limited to 'syz-ci')
| -rw-r--r-- | syz-ci/jobs.go | 1 | ||||
| -rw-r--r-- | syz-ci/manager.go | 1 | ||||
| -rw-r--r-- | syz-ci/syz-ci.go | 1 |
3 files changed, 3 insertions, 0 deletions
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"` |