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. --- Makefile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'Makefile') 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: -- cgit mrf-deployment