diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-20 16:29:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-20 16:29:59 -0700 |
| commit | e4efb39555582c5687df7a585f4cd9043dcd8ebc (patch) | |
| tree | aa20430040a6f8fc3611df49347b3695c626bd5b | |
| parent | Merge branch 'jk/test-copy-bytes-fix' (diff) | |
| parent | Makefile: allow combining UBSan with other sanitizers (diff) | |
| download | git-e4efb39555582c5687df7a585f4cd9043dcd8ebc.tar.gz git-e4efb39555582c5687df7a585f4cd9043dcd8ebc.zip | |
Merge branch 'jk/build-with-asan'
A recent update made it easier to use "-fsanitize=" option while
compiling but supported only one sanitize option. Allow more than
one to be combined, joined with a comma, like "make SANITIZE=foo,bar".
* jk/build-with-asan:
Makefile: allow combining UBSan with other sanitizers
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1022,10 +1022,15 @@ ifdef DEVELOPER CFLAGS += $(DEVELOPER_CFLAGS) endif +comma := , +empty := +space := $(empty) $(empty) + ifdef SANITIZE +SANITIZERS := $(foreach flag,$(subst $(comma),$(space),$(SANITIZE)),$(flag)) 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 |