Makefile: allow combining UBSan with other sanitizers

Multiple sanitizers can be specified as a comma-separated list.  Set
the flag NO_UNALIGNED_LOADS even if UndefinedBehaviorSanitizer is not
the only sanitizer to build with.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index 852dedc25c57b61e5f3747d1c1efb533329fb543..d3ba23fdd2b1076bc686d7c3c1b20a4a321ad927 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -991,10 +991,15 @@ ifdef DEVELOPER
 CFLAGS += $(DEVELOPER_CFLAGS)
 endif
 
 CFLAGS += $(DEVELOPER_CFLAGS)
 endif
 

+comma := ,
+empty :=
+space := $(empty) $(empty)
+

 ifdef SANITIZE
 ifdef SANITIZE

+SANITIZERS := $(foreach flag,$(subst $(comma),$(space),$(SANITIZE)),$(flag))

 BASIC_CFLAGS += -fsanitize=$(SANITIZE) -fno-sanitize-recover=$(SANITIZE)
 BASIC_CFLAGS += -fno-omit-frame-pointer
 BASIC_CFLAGS += -fsanitize=$(SANITIZE) -fno-sanitize-recover=$(SANITIZE)
 BASIC_CFLAGS += -fno-omit-frame-pointer

-ifeq ($(SANITIZE),undefined)
+ifneq ($(filter undefined,$(SANITIZERS)),)

 BASIC_CFLAGS += -DNO_UNALIGNED_LOADS
 endif
 endif
 BASIC_CFLAGS += -DNO_UNALIGNED_LOADS
 endif
 endif