From fa3d6b0b21cfd27db2381afedc5da7a69d587191 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
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.
---
 Makefile             | 16 +++++++++++-----
 tools/syz-env/env.go |  7 +++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 8cc293c50..af304033d 100644
--- a/Makefile
+++ b/Makefile
@@ -110,14 +110,20 @@ target:
 
 # executor uses stacks of limited size, so no jumbo frames.
 executor:
-ifeq ($(BUILDOS),$(NATIVEBUILDOS))
-	mkdir -p ./bin/$(TARGETOS)_$(TARGETARCH)
-	$(CC) -o ./bin/$(TARGETOS)_$(TARGETARCH)/syz-executor$(EXE) executor/executor.cc \
-		$(ADDCFLAGS) $(CFLAGS) -DGOOS_$(TARGETOS)=1 -DGOARCH_$(TARGETARCH)=1  -DGIT_REVISION=\"$(REV)\"
-else
+ifneq ("$(BUILDOS)", "$(NATIVEBUILDOS)")
 	$(info ************************************************************************************)
 	$(info Building executor for ${TARGETOS} is not supported on ${BUILDOS}. Executor will not be built.)
 	$(info ************************************************************************************)
+else
+ifneq ("$(NO_CROSS_COMPILER)", "")
+	$(info ************************************************************************************)
+	$(info Native cross-compiler $(CC) is missing. Executor will not be built.)
+	$(info ************************************************************************************)
+else
+	mkdir -p ./bin/$(TARGETOS)_$(TARGETARCH)
+	$(CC) -o ./bin/$(TARGETOS)_$(TARGETARCH)/syz-executor$(EXE) executor/executor.cc \
+		$(ADDCFLAGS) $(CFLAGS) -DGOOS_$(TARGETOS)=1 -DGOARCH_$(TARGETARCH)=1  -DGIT_REVISION=\"$(REV)\"
+endif
 endif
 
 manager:
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