From e943efbb5f2ad2dccf7dad19c84a1317e5c61a11 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 7 Dec 2020 14:30:37 -0500 Subject: [PATCH] Try to make scan-build.mk work without scan-build installed. --- Make.scan-build | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Make.scan-build b/Make.scan-build index 4177906..7697cb8 100644 --- a/Make.scan-build +++ b/Make.scan-build @@ -1,9 +1,6 @@ -SCAN_BUILD ?= $(shell x=$$(which --skip-alias --skip-functions scan-build 2>/dev/null) ; [ -n "$$x" ] && echo 1) -ifeq ($(SCAN_BUILD),) - SCAN_BUILD_ERROR = $(error scan-build not found) -endif +SCAN_BUILD ?= $(shell x=$$(which --skip-alias --skip-functions scan-build 2>/dev/null) ; [ -n "$$x" ] && echo "$$x") -scan-test : ; $(SCAN_BUILD_ERROR) +scan-test : ; $(if $(findstring /,$(SCAN_BUILD)),,$(error scan-build not found)) scan-clean : @if [[ -d scan-results ]]; then rm -rf scan-results && echo "removed 'scan-results'"; fi