summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-30 22:17:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-30 22:17:09 (GMT)
commit808dab2b58bdf8fb28ad932f32659ede97bb2387 (patch)
tree7f691c6c5aa06e34af321dfe368f8fab02f6675a /Makefile
parentfec1ff97c2b3c9c5db7e8f2df8d2c81cb94972fd (diff)
parentf65d07fffaadc556b1a18cda7bb611c7f68717ea (diff)
downloadgit-808dab2b58bdf8fb28ad932f32659ede97bb2387.zip
git-808dab2b58bdf8fb28ad932f32659ede97bb2387.tar.gz
git-808dab2b58bdf8fb28ad932f32659ede97bb2387.tar.bz2
Merge branch 'jk/asan-build-fix'
Work around test breakages caused by custom regex engine used in libasan, when address sanitizer is used with more recent versions of gcc and clang. * jk/asan-build-fix: Makefile: use compat regex with SANITIZE=address
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 0061f96..6134104 100644
--- a/Makefile
+++ b/Makefile
@@ -1221,6 +1221,9 @@ endif
ifneq ($(filter leak,$(SANITIZERS)),)
BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS
endif
+ifneq ($(filter address,$(SANITIZERS)),)
+NO_REGEX = NeededForASAN
+endif
endif
ifndef sysconfdir