From fa3d6b0b21cfd27db2381afedc5da7a69d587191 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 24 Jan 2019 11:28:55 +0100 Subject: Makefile: don't cross-compile executor if cross-compiler is missing We started building netbsd executor on linux. This fails on CI since cross-compiler is missing. But we don't want to exclude netbsd from presubmit entirely. So check if cross-compiler is missing and just produce a warning. This should unbreak CI and humans will see the warning. --- tools/syz-env/env.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tools') diff --git a/tools/syz-env/env.go b/tools/syz-env/env.go index a5fc4fbb1..cae88c5a9 100644 --- a/tools/syz-env/env.go +++ b/tools/syz-env/env.go @@ -6,6 +6,7 @@ package main import ( "fmt" "os" + "os/exec" "runtime" "strconv" "strings" @@ -40,6 +41,12 @@ func main() { {"ADDCFLAGS", strings.Join(target.CrossCFlags, " ")}, {"NCORES", strconv.Itoa(runtime.NumCPU())}, {"EXE", target.ExeExtension}, + {"NATIVEBUILDOS", target.BuildOS}, + } + if targetOS != runtime.GOOS { + if _, err := exec.LookPath(target.CCompiler); err != nil { + vars = append(vars, Var{"NO_CROSS_COMPILER", "yes"}) + } } for _, v := range vars { fmt.Printf("export %v=%v\\n", v.Name, v.Val) -- cgit mrf-deployment