diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:42:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:42:29 -0800 |
| commit | 54bbadaeca930183989bcd097bde7befa98dc2f9 (patch) | |
| tree | fb8b156be7627ec4672c5a86cda98820894ed3f6 /Makefile | |
| parent | Merge branch 'ds/sparse-cone' into maint (diff) | |
| parent | Makefile: use compat regex with SANITIZE=address (diff) | |
| download | tgif-54bbadaeca930183989bcd097bde7befa98dc2f9.tar.xz | |
Merge branch 'jk/asan-build-fix' into maint
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-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1220,6 +1220,9 @@ endif ifneq ($(filter leak,$(SANITIZERS)),) BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS endif +ifneq ($(filter address,$(SANITIZERS)),) +NO_REGEX = NeededForASAN +endif endif ifndef sysconfdir |