[asterisk-commits] Build: Fix menuselect USAN conflicts (asterisk[master])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

Change subject: Build: Fix menuselect USAN conflicts
......................................................................


Build: Fix menuselect USAN conflicts

USAN can be used together with other sanitizers.

Reported by: Badalyan Vyacheslav
Tested by: Badalyan Vyacheslav

Change-Id: I3bffa350d70965c3026651dba3a12414d0aaa45f
---
M build_tools/cflags.xml
1 file changed, 0 insertions(+), 6 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index 43f7d56..557ea39 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -88,7 +88,6 @@
 			<support_level>extended</support_level>
 			<conflict>THREAD_SANITIZER</conflict>
 			<conflict>LEAK_SANITIZER</conflict>
-			<conflict>UNDEFINED_SANITIZER</conflict>
 			<conflict>MALLOC_DEBUG</conflict>
 			<conflict>DEBUG_CHAOS</conflict>
 		</member>
@@ -96,21 +95,16 @@
 			<support_level>extended</support_level>
 			<conflict>ADDRESS_SANITIZER</conflict>
 			<conflict>LEAK_SANITIZER</conflict>
-			<conflict>UNDEFINED_SANITIZER</conflict>
 		</member>
 		<member name="LEAK_SANITIZER" displayname="Leak Sanitizer">
 			<support_level>extended</support_level>
 			<conflict>ADDRESS_SANITIZER</conflict>
 			<conflict>THREAD_SANITIZER</conflict>
-			<conflict>UNDEFINED_SANITIZER</conflict>
 			<conflict>MALLOC_DEBUG</conflict>
 			<conflict>DEBUG_CHAOS</conflict>
 		</member>
 		<member name="UNDEFINED_SANITIZER" displayname="Undefined Behavior Sanitizer">
 			<support_level>extended</support_level>
-			<conflict>ADDRESS_SANITIZER</conflict>
-			<conflict>THREAD_SANITIZER</conflict>
-			<conflict>LEAK_SANITIZER</conflict>
 		</member>
 		<member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part">
 			<conflict>BUSYDETECT_COMPARE_TONE_AND_SILENCE</conflict>

-- 
To view, visit https://gerrit.asterisk.org/2227
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3bffa350d70965c3026651dba3a12414d0aaa45f
Gerrit-PatchSet: 3
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Badalian Vyacheslav <v.badalyan at open-bs.ru>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: George Joseph <george.joseph at fairview5.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>