From 19e9088bb7b82fd5d7ece380a9495456350e3876 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 13 Sep 2018 12:13:54 +0200 Subject: syz-ci: use gmake instead of make on openbsd Update #712 --- pkg/instance/instance.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'pkg/instance/instance.go') diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go index ffa8631a7..cc04c5b35 100644 --- a/pkg/instance/instance.go +++ b/pkg/instance/instance.go @@ -12,6 +12,7 @@ import ( "net" "os" "path/filepath" + "runtime" "strings" "time" @@ -61,7 +62,7 @@ func (env *Env) BuildSyzkaller(repo, commit string) error { if _, err := vcs.NewSyzkallerRepo(cfg.Syzkaller).CheckoutCommit(repo, commit); err != nil { return fmt.Errorf("failed to checkout syzkaller repo: %v", err) } - cmd := osutil.Command("make", "target") + cmd := osutil.Command(MakeBin, "target") cmd.Dir = cfg.Syzkaller cmd.Env = append([]string{}, os.Environ()...) cmd.Env = append(cmd.Env, @@ -397,3 +398,10 @@ func ExecprogCmd(execprog, executor, OS, arch, sandbox string, repeat, threaded, procs, repeatCount, threaded, collide, faultCall, faultNth, progFile) } + +var MakeBin = func() string { + if runtime.GOOS == "openbsd" { + return "gmake" + } + return "make" +}() -- cgit mrf-deployment