aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/instance
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2018-09-13 12:13:54 +0200
committerDmitry Vyukov <dvyukov@google.com>2018-09-13 12:13:54 +0200
commit19e9088bb7b82fd5d7ece380a9495456350e3876 (patch)
treebdc4880bc531ab549f4ebb4bc2273ca90e5ef005 /pkg/instance
parent61ed43a86a3721708aeeee72b23bfa1eacd921b2 (diff)
syz-ci: use gmake instead of make on openbsd
Update #712
Diffstat (limited to 'pkg/instance')
-rw-r--r--pkg/instance/instance.go10
1 files changed, 9 insertions, 1 deletions
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"
+}()