diff options
| author | Siddharth Muralee <siddharth.muralee@gmail.com> | 2019-12-17 13:20:50 +0000 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-12-17 15:02:51 +0100 |
| commit | 1af3875f3f0015538d778e5710e26bc94822f2fc (patch) | |
| tree | 522756aec167271d73607a83d3221e4ad5134f74 /pkg | |
| parent | 7b9de469e696f30f158d023b4f8f7b624123c8d6 (diff) | |
pkg/build: Fix always true case
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/netbsd.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkg/build/netbsd.go b/pkg/build/netbsd.go index cc9b3e122..7bcc4ae39 100644 --- a/pkg/build/netbsd.go +++ b/pkg/build/netbsd.go @@ -28,29 +28,29 @@ func (ctx netbsd) build(params *Params) error { if err := osutil.WriteFile(filepath.Join(confDir, kernelName), params.Config); err != nil { return err } - // Build tools before building kernel - if strings.HasSuffix(params.Compiler, "g++") { + + if strings.HasSuffix(params.Compiler, "clang++") { + // Build tools before building 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", "tools"); err != nil { + "-U", "-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", "kernel="+kernelName); err != nil { + "-U", "-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, "clang++") { + } 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", - "-V", "MKLLVM=yes", "-V", "MKGCC=no", "-V", "HAVE_LLVM=yes", "tools"); err != nil { + "-U", "-u", "-j"+strconv.Itoa(runtime.NumCPU()), "-V", "MKCTF=no", "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", - "-V", "MKLLVM=yes", "-V", "MKGCC=no", "-V", "HAVE_LLVM=yes", "kernel="+kernelName); err != nil { + "-U", "-u", "-j"+strconv.Itoa(runtime.NumCPU()), "-V", "MKCTF=no", "kernel="+kernelName); err != nil { return err } } |