Merge "Fix bug when memtag_heap in diag but not sanitizers"
This commit is contained in:
@@ -249,6 +249,13 @@ ifneq ($(filter memtag_heap memtag_stack,$(my_sanitize)),)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Ignore SANITIZE_TARGET_DIAG=memtag_heap without SANITIZE_TARGET=memtag_heap
|
||||
# This can happen if a condition above filters out memtag_heap from
|
||||
# my_sanitize. It is easier to handle all of these cases here centrally.
|
||||
ifneq ($(filter memtag_heap,$(my_sanitize_diag)),)
|
||||
my_sanitize_diag := $(filter-out memtag_heap,$(my_sanitize_diag))
|
||||
endif
|
||||
|
||||
ifneq ($(filter memtag_heap,$(my_sanitize)),)
|
||||
my_cflags += -fsanitize=memtag-heap
|
||||
my_sanitize := $(filter-out memtag_heap,$(my_sanitize))
|
||||
|
Reference in New Issue
Block a user