diff options
| author | Siddharth M <siddharth.muralee@gmail.com> | 2020-04-20 11:33:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 20:33:00 +0200 |
| commit | f85457bbf0a13d04dcbbb3ebd8d189b1191db6ad (patch) | |
| tree | 32f2afd0c0100db5455806591a9c1d18fe7b3b78 /pkg | |
| parent | 347a5dc3c7886bfe3ce784eabc5ee30100f13e0a (diff) | |
pkg/build: remove '-u' option for NetBSD build and increase timeout (#1686)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/netbsd.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkg/build/netbsd.go b/pkg/build/netbsd.go index 68836f3a1..e2e7be618 100644 --- a/pkg/build/netbsd.go +++ b/pkg/build/netbsd.go @@ -31,26 +31,26 @@ func (ctx netbsd) build(params *Params) error { if strings.HasSuffix(params.Compiler, "clang++") { // Build tools before building kernel - if _, err := osutil.RunCmd(30*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch, - "-U", "-u", "-j"+strconv.Itoa(runtime.NumCPU()), "-V", "MKCTF=no", + if _, err := osutil.RunCmd(60*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch, + "-U", "-j"+strconv.Itoa(runtime.NumCPU()), "-V", "MKCTF=no", "-V", "MKLLVM=yes", "-V", "MKGCC=no", "-V", "HAVE_LLVM=yes", "tools"); err != nil { return err } // Build kernel - if _, err := osutil.RunCmd(10*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch, - "-U", "-u", "-j"+strconv.Itoa(runtime.NumCPU()), "-V", "MKCTF=no", + if _, err := osutil.RunCmd(20*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch, + "-U", "-j"+strconv.Itoa(runtime.NumCPU()), "-V", "MKCTF=no", "-V", "MKLLVM=yes", "-V", "MKGCC=no", "-V", "HAVE_LLVM=yes", "kernel="+kernelName); err != nil { return err } } else if strings.HasSuffix(params.Compiler, "g++") { - if _, err := osutil.RunCmd(10*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch, - "-U", "-u", "-j"+strconv.Itoa(runtime.NumCPU()), "-V", "MKCTF=no", "tools"); err != nil { + if _, err := osutil.RunCmd(30*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch, + "-U", "-j"+strconv.Itoa(runtime.NumCPU()), "-V", "MKCTF=no", "tools"); err != nil { return err } - if _, err := osutil.RunCmd(10*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch, - "-U", "-u", "-j"+strconv.Itoa(runtime.NumCPU()), "-V", "MKCTF=no", "kernel="+kernelName); err != nil { + if _, err := osutil.RunCmd(20*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch, + "-U", "-j"+strconv.Itoa(runtime.NumCPU()), "-V", "MKCTF=no", "kernel="+kernelName); err != nil { return err } } |